Merge branch 'release/0.7.14.0'v0.7.14.0

18 files changed, 805 insertions, 270 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 28f9edea4..5b6980af4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,7 +12,7 @@ Rails/HttpPositionalArguments:
   Enabled: false
 
 # Commonly used screens these days easily fit more than 80 characters.
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
 # Too short methods lead to extraction of single-use methods, which can make
@@ -62,7 +62,7 @@ Style/SymbolArray:
   Enabled: true
 
 # Most readable form.
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -84,7 +84,6 @@ Style/CollectionMethods:
     # inject seems more common in the community.
     reduce: "inject"
 
-
 # Either allow this style or don't. Marking it as safe with parenthesis
 # is silly. Let's try to live without them for now.
 Style/ParenthesesAroundCondition:
@@ -111,7 +110,7 @@ Style/SignalException:
 # Suppressing exceptions can be perfectly fine, and be it to avoid to
 # explicitly type nil into the rescue since that's what you want to return,
 # or suppressing LoadError for optional dependencies
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 
 Layout/SpaceInsideBlockBraces:
@@ -174,3 +173,13 @@ Style/NumericPredicate:
 # Reset some HoundCI changes back to Rubocop defaults
 Layout/DotPosition:
   EnforcedStyle: leading
+
+# Not enabled by default but good
+Style/HashEachMethods:
+  Enabled: true
+
+# TODO: Enable with Ruby 2.5
+Style/HashTransformKeys:
+  Enabled: false
+Style/HashTransformValues:
+  Enabled: false
diff --git a/.ruby-version b/.ruby-version
index 6b4950e3d..5154b3f68 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4
+2.6
diff --git a/.travis.yml b/.travis.yml
index e32431bdd..f3b0fd484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: ruby
 
 rvm:
-  - 2.4.2
-  - 2.3.5
+  - 2.6.6
+  - 2.5.8
 
 env:
   - DB=postgresql BUILD_TYPE=cucumber
diff --git a/Changelog.md b/Changelog.md
index 886b5cc40..ece7eae94 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+# 0.7.14.0
+
+## Refactor
+* Update the suggested Ruby version to 2.6. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.6`. [#7929](https://github.com/diaspora/diaspora/pull/7929)
+
+## Bug fixes
+* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063)
+* Properly validate a profile's gender field length instead of failing with a database error. [#8127](https://github.com/diaspora/diaspora/pull/8127)
+
+## Features
+
 # 0.7.13.0
 
 ## Security
diff --git a/Gemfile b/Gemfile
index 4416b5feb..e35e5da47 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "5.2.4.1"
+gem "rails", "5.2.4.3"
 
 # Legacy Rails features, remove me!
 # responders (class level)
@@ -10,7 +10,7 @@ gem "responders", "2.4.1"
 
 # Appserver
 
-gem "unicorn", "5.5.1", require: false
+gem "unicorn", "5.5.3", require: false
 gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
@@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.6"
 # API and JSON
 
 gem "acts_as_api", "1.0.1"
-gem "json",        "2.2.0"
+gem "json",        "2.3.0"
 gem "json-schema", "2.8.1"
 
 # Authentication
@@ -29,16 +29,16 @@ gem "json-schema", "2.8.1"
 gem "devise", "4.7.1"
 gem "devise-two-factor", "3.0.3"
 gem "devise_lastseenable", "0.0.6"
-gem "rqrcode", "0.10.1"
+gem "rqrcode", "1.1.2"
 
 # Captcha
 
-gem "simple_captcha2", "0.4.3", require: "simple_captcha"
+gem "simple_captcha2", "0.5.0", require: "simple_captcha"
 
 # Background processing
 
 gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272
-gem "sidekiq", "5.2.7"
+gem "sidekiq", "5.2.8"
 
 # Scheduled processing
 
@@ -46,7 +46,7 @@ gem "sidekiq-cron", "1.1.0"
 
 # Compression
 
-gem "uglifier", "4.1.20"
+gem "uglifier", "4.2.0"
 
 # Configuration
 
@@ -68,19 +68,19 @@ gem "sprockets-rails",        "3.2.1"
 # Database
 
 group :mysql, optional: true do
-  gem "mysql2", "0.5.2"
+  gem "mysql2", "0.5.3"
 end
 group :postgresql, optional: true do
-  gem "pg",     "1.1.4"
+  gem "pg",     "1.2.3"
 end
 
 
-gem "activerecord-import", "1.0.2"
+gem "activerecord-import", "1.0.4"
 
 # File uploading
 
 gem "carrierwave", "1.3.1"
-gem "fog-aws",     "3.5.1"
+gem "fog-aws",     "3.5.2"
 gem "mini_magick", "4.10.1"
 
 # GUID generation
@@ -92,9 +92,9 @@ gem "entypo-rails", "3.0.0"
 
 # JavaScript
 
-gem "handlebars_assets", "0.23.4"
+gem "handlebars_assets", "0.23.8"
 gem "jquery-rails",      "4.3.5"
-gem "js-routes",         "1.4.7"
+gem "js-routes",         "1.4.9"
 gem "js_image_paths",    "0.1.1"
 
 source "https://gems.diasporafoundation.org" do
@@ -138,19 +138,19 @@ gem "rails-i18n",           "5.1.3"
 gem "markerb",             "1.1.0"
 
 # Map
-gem "leaflet-rails",       "1.5.1"
+gem "leaflet-rails",       "1.6.0"
 
 # Parsing
 
-gem "nokogiri",          "1.10.8"
+gem "nokogiri",          "1.10.9"
 gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb
-gem "redcarpet",         "3.4.0"
+gem "redcarpet",         "3.5.0"
 gem "ruby-oembed",       "0.12.0"
 gem "twitter-text",      "1.14.7"
 
 # RTL support
 
-gem "string-direction", "1.2.1"
+gem "string-direction", "1.2.2"
 
 # Security Headers
 
@@ -158,11 +158,11 @@ gem "secure_headers", "6.3.0"
 
 # Services
 
-gem "omniauth",           "1.9.0"
+gem "omniauth",           "1.9.1"
 gem "omniauth-tumblr",    "1.2"
 gem "omniauth-twitter",   "1.4.0"
 gem "omniauth-wordpress", "0.2.2"
-gem "twitter",            "6.2.0"
+gem "twitter",            "7.0.0"
 
 # OpenID Connect
 gem "openid_connect", "1.1.8"
@@ -177,11 +177,11 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasp
 
 # Tags
 
-gem "acts-as-taggable-on", "6.0.0"
+gem "acts-as-taggable-on", "6.5.0"
 
 # URIs and HTTP
 
-gem "addressable",        "2.6.0", require: "addressable/uri"
+gem "addressable",        "2.7.0", require: "addressable/uri"
 gem "faraday",            "0.15.4"
 gem "faraday_middleware", "0.13.1"
 gem "faraday-cookie_jar", "0.0.6"
@@ -189,11 +189,11 @@ gem "typhoeus",           "1.3.1"
 
 # Views
 
-gem "gon",                     "6.2.1"
-gem "hamlit",                  "2.9.3"
+gem "gon",                     "6.3.2"
+gem "hamlit",                  "2.11.0"
 gem "mobile-fu",               "1.4.0"
-gem "rails-timeago",           "2.17.1"
-gem "will_paginate",           "3.1.7"
+gem "rails-timeago",           "2.18.0"
+gem "will_paginate",           "3.3.0"
 
 # Logging
 
@@ -210,7 +210,7 @@ gem "rubyzip", "1.3.0", require: "zip"
 # https://github.com/discourse/discourse/pull/238
 gem "minitest"
 
-gem "versionist", "2.0.0"
+gem "versionist", "2.0.1"
 
 # Windows and OSX have an execjs compatible runtime built-in, Linux users should
 # install Node.js or use "therubyracer".
@@ -236,30 +236,30 @@ group :production do # we don"t install these on travis to speed up test runs
 
   # Third party asset hosting
 
-  gem "asset_sync", "2.7.0", require: false
+  gem "asset_sync", "2.11.0", require: false
 end
 
 group :development do
   # Automatic test runs
-  gem "guard",          "2.15.0", require: false
+  gem "guard",          "2.16.1", require: false
   gem "guard-rspec",    "4.7.3", require: false
   gem "guard-rubocop",  "1.3.0", require: false
   gem "rb-fsevent",     "0.10.3", require: false
-  gem "rb-inotify",     "0.10.0", require: false
+  gem "rb-inotify",     "0.10.1", require: false
 
   # Linters
-  gem "haml_lint",      "0.28.0", require: false
+  gem "haml_lint",      "0.35.0", require: false
   gem "pronto",         "0.10.0", require: false
   gem "pronto-eslint",  "0.10.0", require: false
   gem "pronto-haml",    "0.10.0", require: false
   gem "pronto-rubocop", "0.10.0", require: false
   gem "pronto-scss",    "0.10.0", require: false
-  gem "rubocop",        "0.72.0", require: false
-  gem "rubocop-rails",  "2.1.0", require: false
+  gem "rubocop",        "0.80.1", require: false
+  gem "rubocop-rails",  "2.4.1", require: false
 
   # Preloading environment
 
-  gem "spring", "2.0.2"
+  gem "spring", "2.1.0"
   gem "spring-commands-rspec", "1.0.4"
   gem "spring-commands-cucumber", "1.0.1"
 
@@ -276,25 +276,25 @@ end
 group :test do
   # RSpec (unit tests, some integration tests)
 
-  gem "fixture_builder",   "0.5.2.rc3"
-  gem "fuubar",            "2.4.1"
+  gem "fixture_builder",   "0.5.2"
+  gem "fuubar",            "2.5.0"
   gem "json-schema-rspec", "0.0.4"
   gem "rspec-json_expectations", "~> 2.1"
 
   # Cucumber (integration tests)
 
   gem "capybara",           "3.15.0"
-  gem "database_cleaner",   "1.7.0"
+  gem "database_cleaner",   "1.8.3"
   gem "poltergeist",        "1.18.1"
 
   gem "cucumber-api-steps", "0.14", require: false
 
   # General helpers
 
-  gem "factory_girl_rails", "4.8.0"
+  gem "factory_girl_rails", "4.9.0"
   gem "shoulda-matchers",   "4.0.1"
   gem "timecop",            "0.9.1"
-  gem "webmock",            "3.6.0", require: false
+  gem "webmock",            "3.8.3", require: false
 
   gem "diaspora_federation-test", "0.2.6"
 
@@ -304,13 +304,13 @@ end
 
 group :development, :test do
   # RSpec (unit tests, some integration tests)
-  gem "rspec-rails", "3.8.2"
+  gem "rspec-rails", "3.9.1"
 
   # Cucumber (integration tests)
-  gem "cucumber-rails", "1.7.0", require: false
+  gem "cucumber-rails", "2.0.0", require: false
 
   # Jasmine (client side application tests (JS))
-  gem "jasmine",                   "3.4.0"
+  gem "jasmine",                   "3.5.1"
   gem "jasmine-jquery-rails",      "2.0.3"
   gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org"
   gem "sinon-rails",               "1.15.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index dcfa93edc..c9783a4d2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,25 +2,25 @@ GEM
   remote: https://rubygems.org/
   remote: https://gems.diasporafoundation.org/
   specs:
-    actioncable (5.2.4.1)
-      actionpack (= 5.2.4.1)
+    actioncable (5.2.4.3)
+      actionpack (= 5.2.4.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
+    actionmailer (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.1)
-      actionview (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionpack (5.2.4.3)
+      actionview (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    actionview (5.2.4.3)
+      activesupport (= 5.2.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -28,37 +28,37 @@ GEM
     active_model_serializers (0.9.7)
       activemodel (>= 3.2)
       concurrent-ruby (~> 1.0)
-    activejob (5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activejob (5.2.4.3)
+      activesupport (= 5.2.4.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       arel (>= 9.0)
-    activerecord-import (1.0.2)
+    activerecord-import (1.0.4)
       activerecord (>= 3.2)
-    activestorage (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
+    activestorage (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.1)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (6.0.0)
-      activerecord (~> 5.0)
+    acts-as-taggable-on (6.5.0)
+      activerecord (>= 5.0, < 6.1)
     acts_as_api (1.0.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.0.1)
     arel (9.0.0)
-    asset_sync (2.7.0)
+    asset_sync (2.11.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
@@ -69,16 +69,16 @@ GEM
     attr_required (1.0.1)
     autoprefixer-rails (8.6.5)
       execjs
-    backports (3.15.0)
+    backports (3.17.0)
     bcrypt (3.1.13)
-    bindata (2.4.4)
+    bindata (2.4.6)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     bootstrap-switch-rails (3.3.3)
     buftok (0.2.0)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.1)
     capybara (3.15.0)
       addressable
       mini_mime (>= 0.1.3)
@@ -160,15 +160,15 @@ GEM
       cucumber-tag_expressions (~> 1.1.0)
       gherkin (~> 5.0)
     cucumber-expressions (6.0.1)
-    cucumber-rails (1.7.0)
-      capybara (>= 2.3.0, < 4)
+    cucumber-rails (2.0.0)
+      capybara (>= 2.12, < 4)
       cucumber (>= 3.0.2, < 4)
-      mime-types (>= 1.17, < 4)
+      mime-types (>= 2.0, < 4)
       nokogiri (~> 1.8)
       railties (>= 4.2, < 7)
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    database_cleaner (1.7.0)
+    database_cleaner (1.8.3)
     devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -201,7 +201,7 @@ GEM
       uuid (~> 2.3, >= 2.3.8)
     diff-lcs (1.3)
     docile (1.3.2)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     encryptor (3.0.0)
     entypo-rails (3.0.0)
@@ -212,11 +212,11 @@ GEM
       execjs
       multi_json (>= 1.3)
       rake
-    et-orbi (1.2.1)
+    et-orbi (1.2.4)
       tzinfo
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    excon (0.72.0)
+    excon (0.73.0)
     execjs (2.7.0)
     eye (0.10.0)
       celluloid (~> 0.17.3)
@@ -224,11 +224,11 @@ GEM
       kostya-sigar (~> 2.0.0)
       state_machines
       thor
-    fabrication (2.20.2)
-    factory_girl (4.8.0)
+    fabrication (2.21.0)
+    factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.8.0)
-      factory_girl (~> 4.8.0)
+    factory_girl_rails (4.9.0)
+      factory_girl (~> 4.9.0)
       railties (>= 3.0.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
@@ -237,19 +237,22 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.1)
-    fixture_builder (0.5.2.rc3)
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    fixture_builder (0.5.2)
       activerecord (>= 2)
       activesupport (>= 2)
       hashdiff
-    fog-aws (3.5.1)
+    fog-aws (3.5.2)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.1.2)
+    fog-core (2.2.0)
       builder
-      excon (~> 0.58)
+      excon (~> 0.71)
       formatador (~> 0.2)
       mime-types
     fog-json (1.2.0)
@@ -259,24 +262,26 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fugit (1.2.2)
+    fugit (1.3.3)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
-    fuubar (2.4.1)
+    fuubar (2.5.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    get_process_mem (0.2.3)
+    get_process_mem (0.2.5)
+      ffi (~> 1.0)
     gherkin (5.1.0)
-    gitlab (4.11.0)
+    gitlab (4.14.0)
       httparty (~> 0.14, >= 0.14.0)
       terminal-table (~> 1.5, >= 1.5.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    gon (6.2.1)
-      actionpack (>= 3.0)
+    gon (6.3.2)
+      actionpack (>= 3.0.20)
+      i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    guard (2.15.0)
+    guard (2.16.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -293,40 +298,41 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    haml (5.0.4)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.28.0)
-      haml (>= 4.0, < 5.1)
+    haml_lint (0.35.0)
+      haml (>= 4.0, < 5.2)
       rainbow
-      rake (>= 10, < 13)
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hamlit (2.9.3)
-      temple (>= 0.8.0)
+    hamlit (2.11.0)
+      temple (>= 0.8.2)
       thor
       tilt
-    handlebars_assets (0.23.4)
+    handlebars_assets (0.23.8)
       execjs (~> 2.0)
       sprockets (>= 2.0.0)
       tilt (>= 1.2)
-    hashdiff (0.4.0)
-    hashie (3.6.0)
-    http (3.3.0)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
+    http (4.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.3.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
     http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    httparty (0.17.0)
+    httparty (0.18.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     i18n-inflector (2.6.7)
       i18n (>= 0.4.1)
@@ -335,25 +341,25 @@ GEM
       i18n-inflector (~> 2.6)
       railties (>= 3.0.0)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.3)
-    jasmine (3.4.0)
-      jasmine-core (~> 3.4.0)
+    jaro_winkler (1.5.4)
+    jasmine (3.5.1)
+      jasmine-core (~> 3.5.0)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (3.4.0)
+    jasmine-core (3.5.0)
     jasmine-jquery-rails (2.0.3)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    js-routes (1.4.7)
+    js-routes (1.4.9)
       railties (>= 4)
       sprockets-rails
     js_image_paths (0.1.1)
       rails (>= 4.0, < 6.0)
       sprockets (>= 3.0.0)
-    json (2.2.0)
+    json (2.3.0)
     json-jwt (1.11.0)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -363,28 +369,27 @@ GEM
     json-schema-rspec (0.0.4)
       json-schema (~> 2.5)
       rspec
-    jsonpath (1.0.4)
+    jsonpath (1.0.5)
       multi_json
       to_regexp (~> 0.2.1)
     jwt (2.2.1)
-    kgio (2.11.2)
+    kgio (2.11.3)
     kostya-sigar (2.0.6)
-    leaflet-rails (1.5.1)
+    leaflet-rails (1.6.0)
       rails (>= 4.2.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     logging-rails (0.6.0)
       logging (>= 1.8)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
+    lumberjack (1.2.4)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
     mail (2.7.1)
@@ -396,41 +401,42 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    mimemagic (0.3.4)
+    mime-types-data (3.2019.1009)
+    mimemagic (0.3.5)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     mobile-fu (1.4.0)
       rack-mobile-detect
       rails
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_test (0.1.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mysql2 (0.5.2)
+    mysql2 (0.5.3)
     naught (1.1.0)
     nenv (0.3.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.7.0)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth-oauth (1.1.0)
       oauth
@@ -460,10 +466,10 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     orm_adapter (0.5.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.19.1)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
-    pg (1.1.4)
+    pg (1.2.3)
     phantomjs (2.1.1.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
@@ -491,12 +497,12 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (3.1.1)
+    public_suffix (4.0.3)
     raabro (1.1.6)
-    rack (2.2.2)
+    rack (2.0.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-google-analytics (1.2.0)
@@ -504,32 +510,32 @@ GEM
       activesupport
     rack-mobile-detect (0.4.0)
       rack
-    rack-oauth2 (1.10.0)
+    rack-oauth2 (1.10.1)
       activesupport
       attr_required
       httpclient
-      json-jwt (>= 1.9.0)
+      json-jwt (>= 1.11.0)
       rack
     rack-piwik (0.3.0)
-    rack-protection (2.0.5)
+    rack-protection (2.0.8.1)
       rack
     rack-rewrite (1.5.1)
     rack-ssl (1.4.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.1)
-      actioncable (= 5.2.4.1)
-      actionmailer (= 5.2.4.1)
-      actionpack (= 5.2.4.1)
-      actionview (= 5.2.4.1)
-      activejob (= 5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activerecord (= 5.2.4.1)
-      activestorage (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    rails (5.2.4.3)
+      actioncable (= 5.2.4.3)
+      actionmailer (= 5.2.4.3)
+      actionpack (= 5.2.4.3)
+      actionview (= 5.2.4.3)
+      activejob (= 5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activerecord (= 5.2.4.3)
+      activestorage (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.1)
+      railties (= 5.2.4.3)
       sprockets-rails (>= 2.0.0)
     rails-assets-autosize (4.0.2)
     rails-assets-backbone (1.3.3)
@@ -589,69 +595,72 @@ GEM
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    rails-timeago (2.17.1)
+    rails-timeago (2.18.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    railties (5.2.4.1)
-      actionpack (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
+    railties (5.2.4.3)
+      actionpack (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    raindrops (0.19.0)
+    raindrops (0.19.1)
     rake (12.3.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.4.0)
+    redcarpet (3.5.0)
     redis (3.3.5)
-    regexp_parser (1.5.1)
-    request_store (1.4.1)
+    regexp_parser (1.7.0)
+    request_store (1.5.0)
       rack (>= 1.4)
     responders (2.4.1)
       actionpack (>= 4.2.0, < 6.0)
       railties (>= 4.2.0, < 6.0)
+    rexml (3.2.4)
     rotp (2.1.2)
-    rqrcode (0.10.1)
+    rqrcode (1.1.2)
       chunky_png (~> 1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+      rqrcode_core (~> 0.1)
+    rqrcode_core (0.1.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.9.0)
     rspec-json_expectations (2.2.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.72.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.1.0)
+    rubocop-rails (2.4.1)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-oembed (0.12.0)
     ruby-progressbar (1.10.1)
-    ruby_dep (1.5.0)
     rubyzip (1.3.0)
-    rugged (0.28.2)
+    rugged (0.99.0)
     safe_yaml (1.0.5)
     sass (3.4.25)
     sass-rails (5.0.7)
@@ -660,9 +669,8 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sassc (2.0.1)
+    sassc (2.2.1)
       ffi (~> 1.9)
-      rake
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
@@ -673,15 +681,15 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (4.0.1)
       activesupport (>= 4.2.0)
-    sidekiq (5.2.7)
+    sidekiq (5.2.8)
       connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
+      rack (< 2.1.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
     sidekiq-cron (1.1.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    simple_captcha2 (0.4.3)
+    simple_captcha2 (0.5.0)
       rails (>= 4.1)
     simple_oauth (0.3.1)
     simplecov (0.16.1)
@@ -691,8 +699,7 @@ GEM
     simplecov-html (0.10.2)
     sinon-rails (1.15.0)
       railties (>= 3.1)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.0)
     spring-commands-cucumber (1.0.1)
       spring (>= 0.9.1)
     spring-commands-rspec (1.0.4)
@@ -705,31 +712,33 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.5.0)
-    string-direction (1.2.1)
+    string-direction (1.2.2)
     swd (1.1.2)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
+    sync (0.5.0)
     sysexits (1.2.0)
     systemu (2.6.5)
-    temple (0.8.1)
+    temple (0.8.2)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     timecop (0.9.1)
     timers (4.3.0)
-    tins (1.20.3)
+    tins (1.24.1)
+      sync
     to_regexp (0.2.1)
     turbo_dev_assets (0.0.2)
-    twitter (6.2.0)
+    twitter (7.0.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.11)
-      http (~> 3.0)
+      http (~> 4.0)
       http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
       memoizable (~> 0.4.0)
@@ -740,15 +749,15 @@ GEM
       unf (~> 0.1.0)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    uglifier (4.1.20)
+    uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
-    unicorn (5.5.1)
+    unicode-display_width (1.6.1)
+    unicorn (5.5.3)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     unicorn-worker-killer (0.4.4)
@@ -763,37 +772,37 @@ GEM
     validate_url (1.0.8)
       activemodel (>= 3.0.0)
       public_suffix
-    versionist (2.0.0)
+    versionist (2.0.1)
       activesupport (>= 3)
       railties (>= 3)
-      yard (~> 0.9.11)
+      yard (~> 0.9.20)
     warden (1.2.8)
       rack (>= 2.0.6)
     webfinger (1.1.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.6.0)
+    webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    will_paginate (3.1.7)
+    websocket-extensions (0.1.5)
+    will_paginate (3.3.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.20)
+    yard (0.9.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_model_serializers (= 0.9.7)
-  activerecord-import (= 1.0.2)
-  acts-as-taggable-on (= 6.0.0)
+  activerecord-import (= 1.0.4)
+  acts-as-taggable-on (= 6.5.0)
   acts_as_api (= 1.0.1)
-  addressable (= 2.6.0)
-  asset_sync (= 2.7.0)
+  addressable (= 2.7.0)
+  asset_sync (= 2.11.0)
   autoprefixer-rails (= 8.6.5)
   bootstrap-sass (= 3.4.1)
   bootstrap-switch-rails (= 3.3.3)
@@ -803,8 +812,8 @@ DEPENDENCIES
   configurate (= 0.3.1)
   coveralls (= 0.8.23)
   cucumber-api-steps (= 0.14)
-  cucumber-rails (= 1.7.0)
-  database_cleaner (= 1.7.0)
+  cucumber-rails (= 2.0.0)
+  database_cleaner (= 1.8.3)
   devise (= 4.7.1)
   devise-two-factor (= 3.0.3)
   devise_lastseenable (= 0.0.6)
@@ -814,46 +823,46 @@ DEPENDENCIES
   diaspora_federation-test (= 0.2.6)
   entypo-rails (= 3.0.0)
   eye (= 0.10.0)
-  factory_girl_rails (= 4.8.0)
+  factory_girl_rails (= 4.9.0)
   faraday (= 0.15.4)
   faraday-cookie_jar (= 0.0.6)
   faraday_middleware (= 0.13.1)
-  fixture_builder (= 0.5.2.rc3)
-  fog-aws (= 3.5.1)
-  fuubar (= 2.4.1)
-  gon (= 6.2.1)
-  guard (= 2.15.0)
+  fixture_builder (= 0.5.2)
+  fog-aws (= 3.5.2)
+  fuubar (= 2.5.0)
+  gon (= 6.3.2)
+  guard (= 2.16.1)
   guard-rspec (= 4.7.3)
   guard-rubocop (= 1.3.0)
-  haml_lint (= 0.28.0)
-  hamlit (= 2.9.3)
-  handlebars_assets (= 0.23.4)
+  haml_lint (= 0.35.0)
+  hamlit (= 2.11.0)
+  handlebars_assets (= 0.23.8)
   http_accept_language (= 2.1.1)
   i18n-inflector-rails (= 1.0.7)
-  jasmine (= 3.4.0)
+  jasmine (= 3.5.1)
   jasmine-jquery-rails (= 2.0.3)
   jquery-rails (= 4.3.5)
-  js-routes (= 1.4.7)
+  js-routes (= 1.4.9)
   js_image_paths (= 0.1.1)
-  json (= 2.2.0)
+  json (= 2.3.0)
   json-schema (= 2.8.1)
   json-schema-rspec (= 0.0.4)
-  leaflet-rails (= 1.5.1)
+  leaflet-rails (= 1.6.0)
   logging-rails (= 0.6.0)
   markdown-it-html5-embed (= 1.0.0)
   markerb (= 1.1.0)
   mini_magick (= 4.10.1)
   minitest
   mobile-fu (= 1.4.0)
-  mysql2 (= 0.5.2)
-  nokogiri (= 1.10.8)
-  omniauth (= 1.9.0)
+  mysql2 (= 0.5.3)
+  nokogiri (= 1.10.9)
+  omniauth (= 1.9.1)
   omniauth-tumblr (= 1.2)
   omniauth-twitter (= 1.4.0)
   omniauth-wordpress (= 0.2.2)
   open_graph_reader (= 0.7.0)
   openid_connect (= 1.1.8)
-  pg (= 1.1.4)
+  pg (= 1.2.3)
   poltergeist (= 1.18.1)
   pronto (= 0.10.0)
   pronto-eslint (= 0.10.0)
@@ -867,7 +876,7 @@ DEPENDENCIES
   rack-piwik (= 0.3.0)
   rack-rewrite (= 1.5.1)
   rack-ssl (= 1.4.1)
-  rails (= 5.2.4.1)
+  rails (= 5.2.4.3)
   rails-assets-autosize (= 4.0.2)!
   rails-assets-backbone (= 1.3.3)!
   rails-assets-blueimp-gallery (= 2.33.0)!
@@ -892,44 +901,44 @@ DEPENDENCIES
   rails-assets-utatti-perfect-scrollbar (= 1.4.0)!
   rails-controller-testing (= 1.0.4)
   rails-i18n (= 5.1.3)
-  rails-timeago (= 2.17.1)
+  rails-timeago (= 2.18.0)
   rb-fsevent (= 0.10.3)
-  rb-inotify (= 0.10.0)
-  redcarpet (= 3.4.0)
+  rb-inotify (= 0.10.1)
+  redcarpet (= 3.5.0)
   redis (= 3.3.5)
   responders (= 2.4.1)
-  rqrcode (= 0.10.1)
+  rqrcode (= 1.1.2)
   rspec-json_expectations (~> 2.1)
-  rspec-rails (= 3.8.2)
-  rubocop (= 0.72.0)
-  rubocop-rails (= 2.1.0)
+  rspec-rails (= 3.9.1)
+  rubocop (= 0.80.1)
+  rubocop-rails (= 2.4.1)
   ruby-oembed (= 0.12.0)
   rubyzip (= 1.3.0)
   sass-rails (= 5.0.7)
   secure_headers (= 6.3.0)
   shoulda-matchers (= 4.0.1)
-  sidekiq (= 5.2.7)
+  sidekiq (= 5.2.8)
   sidekiq-cron (= 1.1.0)
-  simple_captcha2 (= 0.4.3)
+  simple_captcha2 (= 0.5.0)
   simplecov (= 0.16.1)
   sinon-rails (= 1.15.0)
-  spring (= 2.0.2)
+  spring (= 2.1.0)
   spring-commands-cucumber (= 1.0.1)
   spring-commands-rspec (= 1.0.4)
   sprockets-rails (= 3.2.1)
-  string-direction (= 1.2.1)
+  string-direction (= 1.2.2)
   timecop (= 0.9.1)
   turbo_dev_assets (= 0.0.2)
-  twitter (= 6.2.0)
+  twitter (= 7.0.0)
   twitter-text (= 1.14.7)
   typhoeus (= 1.3.1)
-  uglifier (= 4.1.20)
-  unicorn (= 5.5.1)
+  uglifier (= 4.2.0)
+  unicorn (= 5.5.3)
   unicorn-worker-killer (= 0.4.4)
   uuid (= 2.3.9)
-  versionist (= 2.0.0)
-  webmock (= 3.6.0)
-  will_paginate (= 3.1.7)
+  versionist (= 2.0.1)
+  webmock (= 3.8.3)
+  will_paginate (= 3.3.0)
 
 BUNDLED WITH
    1.17.3
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index daad7c46f..3d00ff6e9 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController
     @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL")
     @created_users.find_each do |u|
       week = u.created_at.beginning_of_week.strftime("%Y-%m-%d")
-      @created_users_by_week[week] << u.username
+      @created_users_by_week[week] << {username: u.username, closed_account: u.person.closed_account}
     end
 
     @selected_week = params[:week] || @created_users_by_week.keys.last
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 74ca9fec6..7a615ffae 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -21,6 +21,7 @@ class Profile < ApplicationRecord
   validates :first_name, :length => { :maximum => 32 }
   validates :last_name, :length => { :maximum => 32 }
   validates :location, :length => { :maximum =>255 }
+  validates :gender, length: {maximum: 255}
 
   validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true
   validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true
diff --git a/app/views/admins/_weekly_user_stats.haml b/app/views/admins/_weekly_user_stats.haml
index a3a9eff07..51e8981d2 100644
--- a/app/views/admins/_weekly_user_stats.haml
+++ b/app/views/admins/_weekly_user_stats.haml
@@ -18,4 +18,8 @@
 = t(".amount_of", count: counter)
 %br
 - created_users_by_week[selected_week].each do |m|
-  = link_to m, "/u/#{m}"
+  - if m[:closed_account]
+    %s
+      = m[:username]
+  - else
+    = link_to m[:username], "/u/#{m[:username]}"
diff --git a/config/defaults.yml b/config/defaults.yml
index 10bb019b7..9cdc34b33 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.7.13.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.7.14.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 68b38f9f7..8d81ef71a 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -258,7 +258,11 @@ el:
     pods:
       use_search_box_q: "Πώς μπορώ να χρησιμοποιήσω το πλαίσιο αναζήτησης για να βρω συγκεκριμένα άτομα;"
     posts_and_posting:
+      format_text_q: "Πώς μπορώ να επεξεργαστώ το κείμενό στις δημοσιεύσεις μου (bold,italics, κτλ.);"
+      hide_posts_q: "Πώς μπορώ να κρύψω μία δημοσίευση;"
+      insert_images_comments_q: "Μπορώ να εισάγω εικόνες στα σχόλια;"
       insert_images_q: "Πώς μπορώ να εισάγω εικόνες στις αναρτήσεις;"
+      size_of_images_q: "Μπορώ να επεξεργαστώ το μέγεθος των εικόνων στις δημοσιεύσεις ή στα σχόλια;"
     private_posts:
       title: "Ιδιωτικές αναρτήσεις"
     third_party_tools: "Εργαλεία τρίτων"
diff --git a/config/locales/diaspora/et.yml b/config/locales/diaspora/et.yml
index 056efcbd8..d7bd36604 100644
--- a/config/locales/diaspora/et.yml
+++ b/config/locales/diaspora/et.yml
@@ -7,18 +7,447 @@
 et:
   _applications: "Rakendused"
   _services: "Teenused"
+  _statistics: "Statistika"
   account: "Konto"
+  activerecord:
+    errors:
+      models:
+        person:
+          attributes:
+            diaspora_handle:
+              taken: "on juba võetud."
+        reshare:
+          attributes:
+            root_guid:
+              taken: "Tore, mis? Sa juba jagasid seda postitust!"
+        user:
+          attributes:
+            email:
+              taken: "on juba võetud."
+            person:
+              invalid: "on ebakorrektne."
+            username:
+              invalid: "on ebakorrektne. Lubatud vaid tähed, numbrid ja allakriipsutatud."
+              taken: "on juba võetud."
+  admins:
+    admin_bar:
+      pages: "Lehed"
+      report: "Aruanded"
+      user_search: "Kasutaja otsing"
+    stats:
+      2weeks: "2 nädalat"
+      daily: "Päevane"
+      go: "Mine"
+      month: "Kuu"
+      usage_statistic: "Statistika"
+      week: "Nädal"
+    user_search:
+      are_you_sure_lock_account: "Oled kindel, et soovid selle konto lukustada?"
+      are_you_sure_unlock_account: "Oled kindel, et soovid selle konto lahti lukustada?"
   are_you_sure: "Oled kindel?"
   are_you_sure_delete_account: "Oled kindel, et soovid oma konto kustutada? Kontot ei saa taastada!"
+  aspects:
+    aspect_stream:
+      stay_updated: "Ole kursis"
+    edit:
+      confirm_remove_aspect: "Oled kindel, et soovid selle aspekti kustutada?"
+      rename: "Nimeta ümber"
+      update: "Uuenda"
+      updating: "Uuendan..."
+    index:
+      donate: "Anneta"
+      help:
+        do_you: "Kas soovid:"
+        need_help: "Vajad abi?"
+        tag_question: "küsimus"
+      introduce_yourself: "See on sinu voog. Hüppa sisse ja tutvusta end."
+      new_here:
+        follow: "Jälgi %{link} ja tervita uusi kasutajaid diasporas*!"
+        learn_more: "Uuri veel"
+        title: "Tere tulemast uued kasutajad"
+      services:
+        content: "Saad ühendada järgnevad teenused diaspoerag*:"
+        heading: "Ühenda teenused"
+      welcome_to_diaspora: "Tere tulemast diaspora*, %{name}!"
+    no_contacts_message:
+      you_should_add_some_more_contacts: "Peaksid lisama rohkem kontakte!"
+    seed:
+      acquaintances: "Tuttavad"
+      family: "Pere"
+      friends: "Sõbrad"
+      work: "Töö"
   cancel: "Tühista"
+  comments:
+    new_comment:
+      comment: "Kommenteeri"
+      commenting: "Kommenteerib..."
+  contacts:
+    index:
+      all_contacts: "Kõik kontaktid"
+      my_contacts: "Minu kontaktid"
+      no_contacts: "Näib, et pead lisama mõned kontaktid!"
+      only_sharing_with_me: "Jagab ainult minuga"
+      start_a_conversation: "Alusta uut vestlust"
+    spotlight:
+      suggest_member: "Soovita kasutajat"
+  conversations:
+    create:
+      fail: "Ebakorrektne sõnum"
+      sent: "Sõnum saadetud"
+    destroy:
+      delete_success: "Vestlus edukalt kustutatud"
+      hide_success: "Vestlus edukalt peidetud"
+    index:
+      conversations_inbox: "Vestlused - Postkast"
+      inbox: "Postkast"
+      new_conversation: "Uus vestlus"
+      no_messages: "Sõnumeid pole"
+    new:
+      send: "Saada"
+      sending: "Saadab..."
+      subject: "Teema"
+      to: "Kellele"
+    show:
+      delete: "Kustuta vestlus"
+      hide: "Peida ja vaigista vestlus"
+      reply: "Vasta"
+      replying: "Vastab..."
   delete: "Eemalda"
   email: "E-mail"
+  error_messages:
+    helper:
+      correct_the_following_errors_and_try_again: "Palun paranda järgnevad vead ja proovi uuesti:"
   find_people: "Otsi inimesi või #silte"
+  help:
+    chat:
+      contacts_page: "kontaktide leht"
+      title: "Vestlus"
+  home:
+    default:
+      choose_your_audience: "Vali oma publik"
+  invitations:
+    new:
+      invite_someone_to_join: "Kutsu kedagi diasporaga* liituma!"
+      paste_link: "Jaga seda linki oma sõpradega kutsumaks neid diasporasse*, või e-postita link neile otse."
+      send_an_invitation: "Saada kutse"
+  layouts:
+    application:
+      back_to_top: "Tagasi üles"
+      public_feed: "Avalik %{name} diaspora* voog"
+      whats_new: "Mis uudist?"
+    header:
+      code: "Kood"
+      logout: "Logi välja"
+      profile: "Profiil"
+      settings: "Seaded"
   limited: "Piiratud"
+  more: "Veel"
+  notifications:
+    index:
+      all_notifications: "Kõik teavitused"
+      also_commented: "Samuti kommenteeritud"
+      and: "ja"
+      and_others:
+        one: "ja üks veel"
+        other: "ja %{count} teist"
+        zero: "ja mitte keegi teine"
+      liked: "Meeldis"
+      mark_all_as_read: "Märgi kõik loetuks"
+      mark_read: "Märgi loetuks"
+      mark_unread: "Märgi mitteloetuks"
+      mentioned: "Mainitud postituses"
+      no_notifications: "Sul ei ole veel teavitusi."
+      notifications: "Teated"
+      reshared: "Jagatud"
+      show_all: "Näita kõiki"
+      show_unread: "Näita lugemata"
+      started_sharing: "Alustas jagamist"
+  notifier:
+    a_post_you_shared: "postitus."
+    a_private_message: "Sulle on diasporas* uus privaatsõnum."
+    click_here: "Kliki siia"
+    comment_on_post:
+      reply: "Vasta või kuva %{name} postitus>"
+    confirm_email:
+      click_link: "Uue eposti aadressi aktiveerimiseks järgi seda linki %{unconfirmed_email}:"
+      subject: "Palun aktiveeri oma uus eposti aadress %{unconfirmed_email}"
+    hello: "Tere %{name}!"
+    invite:
+      message: |-
+          Tere!
+
+          Sind on kutsutud liituma diasporaga* %{user} poolt!
+
+          Alustamiseks vajuta seda linki
+
+          [%{invite_url}][1]
+
+          Või saad lisada %{diaspora_id} oma kontaktidele kui sul juba on konto.
+
+
+          Päikest,
+
+          Olen diaspora* eposti robot!
+
+          P.S. Kui sa ei tea (veel) mis diaspora* on siis [here] [2] on vastus!
+
+           [1] %{invite_url}
+           [2] %{diasporafoundation_url}
+    invited_you: "%{name} kutsub sind diasporasse*"
+    liked:
+      liked: "%{name} märkis sinu postituse meeldivaks"
+      view_post: "Kuva postitus>"
+    mentioned:
+      subject: "%{name} mainis sind diasporas*"
+    private_message:
+      reply_to_or_view: "Vasta või kuva see postitus>"
+    report_email:
+      type:
+        comment: "kommenteeri"
+        post: "Saada"
+    reshared:
+      reshared: "%{name} jagas sinu postitust"
+      view_post: "Kuva postitus>"
+    started_sharing:
+      sharing: "alustas sinuga jagmist!"
+      subject: "%{name} alustas sinuga diasporas* jagamist"
+      view_profile: "Kuva %{name} profiili"
+    thanks: "Tänud,"
   ok: "Oki"
+  people:
+    add_contact:
+      invited_by: "Sind kutsub"
+    index:
+      couldnt_find_them: "Ei leidnud neid?"
+      looking_for: "Otsid postitusi sildiga %{tag_link}?"
+      no_one_found: "...ja kedagi ei leitud."
+      no_results: "Hei! Sa pead midagi otsima."
+      results_for: "%{search_term}-ga sobivad kasutajad"
+      search_handle: "Kasuta nende diaspora* ID-d (username@pod.tld) oma sõprade leidmiseks."
+      searching: "Otsib, palun ole kannatlik..."
+      send_invite: "Ikka ei midagi? Saada kutse!"
+    person:
+      thats_you: "See oled sina!"
+    profile_sidebar:
+      bio: "Biograafia"
+      born: "Sünnipäev"
+      location: "Asukoht"
+    show:
+      closed_account: "See konto on suletud."
+      does_not_exist: "Isikut ei eksisteeri!"
+      has_not_shared_with_you_yet: "%{name} ei ole sinuga veel ühtegi postitust jaganud!"
+  photos:
+    create:
+      integrity_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et see oli pilt?"
+      runtime_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et su turvavöö on kinni?"
+      type_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et pilt oli lisatud?"
+    destroy:
+      notice: "Foto kustutatud."
+    new_profile_photo:
+      upload: "Lae üles uus profiilipilt!"
+  posts:
+    presenter:
+      title: "Postitus %{name} -lt"
+    show:
+      photos_by:
+        one: "Üks foto %{author} -lt"
+        other: "%{count} fotot %{author} -lt"
+        zero: "Pole fotosid %{author} -lt"
+      reshare_by: "Edasijagamine %{author} -lt"
   privacy: "Privaatsus"
   profile: "Profiil"
+  profiles:
+    edit:
+      allow_search: "Luba inimestel sind diasporast* otsida"
+      basic: "Minu peamine profiil"
+      basic_hint: "Iga rida sinu profiilil on mittekohustuslik. Sinu peamine profiil on alati avalikult nähtav."
+      extended: "Minu laiendatud profiil"
+      extended_hint: "Klõpsa end laiendatud profiili teabe muutmiseks. Avalik tähendab, et ta on internetist nähtav, piiratud tähendab nähtavust vaid neile, kellega seda infot jagad."
+      extended_visibility_text: "Sinu laiendatud profiili nähtavus:"
+      first_name: "Eesnimi"
+      last_name: "Perenimi"
+      limited: "Piiratud"
+      nsfw_check: "Märgi kõik mida postitan kui NSFW"
+      nsfw_explanation: "NSFW (\"tööjuures ebaturvaline\") on kogukonna standard sisu kohta, mida ei ole soovitatav tööd tehes vaadata. Kui postitad sellist sisu tihti, palun vali see võimalus, et kõik mida postitad oleks varjatud inimeste uudisvoos v.a. kui nad soovivad seda vaadata."
+      nsfw_explanation2: "Kui valid seda võimalust mitte kasutada, palun lisa #nsfw silt iga kord kui sellist sisu postitad."
+      public: "Avalik"
+      settings: "Profiili seaded"
+      update_profile: "Uuenda profiili"
+      your_bio: "Sinu Biograafia"
+      your_birthday: "Sinu sünnipäev"
+      your_gender: "Sinu sugu"
+      your_location: "Sinu asukoht"
+      your_name: "Sinu nimi"
+      your_photo: "Sinu foto"
+      your_tags: "Kirjelda end 5-e sõnaga"
+      your_tags_placeholder: "Meeldib #privaatsus #kassid #muusika #loodus"
+    update:
+      failed: "Profiili uuendamine ebaõnnestus"
+      updated: "Profiil uuendatud"
   public: "Avalik"
+  registrations:
+    create:
+      success: "Oled liitunud diasporag*!"
+    invalid_invite: "Kutsumise link mille edastasid ei ole enam kehtiv!"
+    new:
+      email: "E-mail"
+      enter_email: "Sisesta oma e-posti aadress"
+      enter_password: "Sisesta parool (min kuus märki)"
+      enter_password_again: "Sisesta sama parool mis enne"
+      password: "Parool"
+      sign_up: "Loo konto"
+      username: "Kasutajanimi"
+  reshares:
+    comment_email_subject: "%{resharer} jagas %{author} postitust"
+    reshare:
+      deleted: "Originaalpostitus autori poolt kustutatud."
+      reshare_confirmation: "Jaga %{author} postitust?"
+      reshared_via: "Jagatud läbi"
   search: "Otsi"
+  services:
+    index:
+      disconnect: "Katkesta ühendus"
+      edit_services: "Muuda teenuseid"
+      logged_in_as: "Sisse logitud %{nickname} -na."
+      really_disconnect: "Katkesta ühendus %{service}?"
   settings: "Seaded"
-  username: "Kasutajanimi"
\ No newline at end of file
+  shared:
+    aspect_dropdown:
+      mobile_row_checked: "(eemalda) %{name}"
+      mobile_row_unchecked: "(lisa) %{name}"
+    invitations:
+      by_email: "Kutsu inimesi e-postiga"
+      invite_your_friends: "Kutsu oma sõpru"
+      invites: "Kutsed"
+    public_explain:
+      control_your_audience: "Halda oma auditooriumi"
+      logged_in: "Sisse logitud %{service} -sse"
+      outside: "Avalikud postitused on nähtavad väljaspool diasporad*."
+      share: "Jaga"
+      visibility_dropdown: "Kasuta seda rippmenüüd muutmaks oma postituse nähtavust. (Soovitame selle esimese avalikuks määrata.)"
+    publisher:
+      discard_post: "Eira postitust"
+      new_user_prefill:
+        hello: "Tere kõigile.Olen %{new_user_tag} "
+        i_like: "Olen huvitatud %{tags} "
+        invited_by: "Tänan kutse eest, "
+      posting: "Postitab..."
+      remove_location: "Eemalda asukoht"
+      share: "Jaga"
+      whats_on_your_mind: "Millest mõtled?"
+    stream_element:
+      via_mobile: "Mobiililt"
+  statistics:
+    active_users_halfyear: "Aktiivseid kasutajaid poolaastas"
+    active_users_monthly: "Aktiivseid kasutajaid kuus"
+    closed: "Suletud"
+    disabled: "Pole saadaval"
+    enabled: "Saadaval"
+    local_comments: "Kohalikud kommentaarid"
+    local_posts: "Kohalikud postitused"
+    name: "Nimi"
+    network: "Võrk"
+    open: "Avatud"
+    registrations: "Registreeringuid"
+    services: "Teenused"
+    total_users: "Kasutajaid kokku"
+    version: "Versioon"
+  streams:
+    activity:
+      title: "Minu tegevus"
+    aspects:
+      all: "Kõik aspektid"
+      title: "Minu aspektid"
+    aspects_stream: "Aspektid"
+    comment_stream:
+      title: "Kommenteeritud postitused"
+    commented:
+      title: "Kommenteeritud postitused"
+    followed_tag:
+      add_a_tag: "Lisa silt"
+      all: "Kõik sildid"
+      follow: "Jälgi"
+      title: "#Jälgitavad sildid"
+    followed_tags_stream: "#Järgitavad sildid"
+    like_stream:
+      title: "Meeldimiste voog"
+    liked:
+      title: "Meeldinud postitused"
+    mentioned_stream: "@Mainimised"
+    mentions:
+      title: "@Mainimised"
+    multi:
+      title: "Voog"
+    public:
+      title: "Avalik tegevus"
+    tags:
+      title: "Postitused siltidega: %{tags}"
+  tags:
+    show:
+      follow: "Jälgi #%{tag}"
+      stop_following: "Lõpeta #%{tag} jälgimine"
+  username: "Kasutajanimi"
+  users:
+    confirm_email:
+      email_confirmed: "E-post %{email} aktiveeritud"
+      email_not_confirmed: "E-posti ei saa aktiveerida. Vale link?"
+    destroy:
+      no_password: "Palun sisesta oma kehtiv parool konto sulgemiseks."
+      wrong_password: "Sisestatud parool ei kattu kehtiva parooliga."
+    edit:
+      also_commented: "keegi kommenteerib postitust mida kommenteerisid"
+      auto_follow_aspect: "Aspekt kasutajatele kelleg automaatselt jagad:"
+      auto_follow_back: "Jaga automaatselt kasutajatega kes alustavad sinuga jagamist"
+      change: "Muuda"
+      change_email: "Muuda e-post"
+      change_language: "Muuda keel"
+      change_password: "Muuda parool"
+      character_minimum_expl: "peab olema vähemalt kuus märki"
+      close_account:
+        dont_go: "Ära palun mine!"
+        lock_username: "Sinu kasutajanimi lukustatakse. Sul ei ole võimalik luua siia uut kontot sama ID-ga."
+        no_turning_back: "Tagasiteed ei ole! Kui oled täiesti kindel, siis sisesta enda parool allpool."
+      close_account_text: "Sulge konto"
+      comment_on_post: "keegi kommenteerib sinu postitust"
+      current_password: "Praegune salasõna"
+      edit_account: "Muuda konto seadeid"
+      email_awaiting_confirmation: "Saatsime aktiveerimislingi %{unconfirmed_email}. Seni kuni uue aadressi aktiveerimiseni jätkame vana %{email} aadressi kasutamist."
+      export_data: "Ekspordi andmed"
+      following: "Jagamise seaded"
+      liked: "kellegile meeldib sinu postitus"
+      mentioned: "sind mainitakse postituses"
+      new_password: "Uus parool"
+      private_message: "sulle on privaatsõnum"
+      receive_email_notifications: "Saa e-posti teavitusi kui:"
+      reshared: "keegi jagab sinu postitust"
+      started_sharing: "keegi alustab sinuga jagamist"
+      stream_preferences: "Voo eelistused"
+      your_email: "Sinu meiliaadress"
+      your_handle: "Sinu diaspora* ID"
+    getting_started:
+      hashtag_explanation: "Sildid aitavad sul rääkida ja jälgida oma huvisid. Samuti on nad head leidmaks uusi inimesi diasporast*."
+      hashtag_suggestions: "Proovi jälgida silte nagu #art, #movies, #eesti, #filmid, jne."
+      what_are_you_in_to: "Mis sulle meeldib?"
+      who_are_you: "Kes sa oled?"
+    privacy_settings:
+      ignored_users: "Ignoreeritud kasutajad"
+      stop_ignoring: "Lõpeta ignoreerimine"
+      strip_exif: "Eemalda metadata nagu asukoht, autor ja kaamera mudel üleslaetavatelt piltidelt (soovitatav)"
+      title: "Privaatsuse seaded"
+    public:
+      does_not_exist: "Kasutajat %{username} ei eksisteeri!"
+    update:
+      email_notifications_changed: "E-post teavitused muudetud"
+      follow_settings_changed: "Jälgimise seaded muudetud"
+      follow_settings_not_changed: "Jälgimise seadete muutmine ebaõnnestus."
+      language_changed: "Keel muudetud"
+      language_not_changed: "Keele vahetamine ebaõnnestus"
+      password_changed: "Parool muudetud. Saad nüüd uue parooliga sisse logida."
+      password_not_changed: "Parooli muutmine ebaõnnestus"
+      settings_not_updated: "Seadete uuendamine ebaõnnestus"
+      settings_updated: "Seaded uuendatud"
+      unconfirmed_email_changed: "E-post muudetud. Vajalik aktiveerimine."
+      unconfirmed_email_not_changed: "E-posti muutmine ebaõnnestus"
+  will_paginate:
+    next_label: "järgmine &raquo;"
+    previous_label: "&laquo; eelmine"
\ No newline at end of file
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 94e902f79..f59c328a3 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -488,7 +488,7 @@ ia:
       format_text_q: "Como pote io formatar le texto in mi entratas (grasse, italic, etc.)?"
       hide_posts_a: "Si tu puncta le mouse verso le parte superior de un entrata, un × appare al dextra. Clicca sur illo pro celar le entrata e silentiar le notificationes sur illo. Tu pote ancora vider le entrata si tu visita le pagina de profilo del persona qui lo ha inviate."
       hide_posts_q: "Como cela io un entrata?"
-      ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos eliminara le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedira que alcun entrata sue appare in tu fluxo, e illa non plus potera commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continuara a esser visibile pro te."
+      ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos elimina le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedi que alcun entrata sue appare in tu fluxo, e illa non plus pote commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continua a esser visibile pro te."
       ignore_user_a2: "Pro ignorar un conto, clicca sur le icone “ignorar” (un circulo con un linea diagonal que lo transversa) in cyma al dextra de un de su entratas. Su entratas disparera immediatemente de tu fluxo. Alternativemente, visita su pagina de profilo e clicca sur le icone “ignorar” illac. Tu potera ancora vider su entratas sur su pagina de profilo, o per usar le vista de entrata singule."
       ignore_user_a3: "Le lista de personas que tu ignora se trova in le configuration de tu conto sub Confidentialitate. Pro cessar de ignorar un persona, remove la del lista sur ille pagina."
       ignore_user_q: "Como impedi io que le entratas de un persona appare in mi fluxo?"
@@ -679,9 +679,9 @@ ia:
       other: "%{actors} commentava tu entrata %{post_link}."
       zero: "%{actors} commentava tu entrata %{post_link}."
     contacts_birthday:
-      one: "%{actors} ha su anniversario le %{date}."
-      other: "%{actors} ha lor anniversario le %{date}."
-      zero: "%{actors} ha lor anniversario le %{date}."
+      one: "%{actors} ha su anniversario %{date}."
+      other: "%{actors} ha lor anniversario %{date}."
+      zero: "%{actors} ha lor anniversario %{date}."
     index:
       all_notifications: "Tote le notificationes"
       also_commented: "Etiam commentava"
diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml
index 85053daa3..a6f9f7c25 100644
--- a/config/locales/diaspora/sc.yml
+++ b/config/locales/diaspora/sc.yml
@@ -593,9 +593,11 @@ sc:
       byline: "Su mundu sotziale in lìnia in ue tenes su controllu"
       choose_your_audience: "Issèbera su pùblicu tuo"
       choose_your_audience_info: "Sas caras de diaspora* ti permitint de cumpartzire cun petzi cussas persones cun las cales cheres tue. Podes èssere pùblicu o privadu cantu cheres. Cumpartzire una fotografia ispassiosa cun totu su mundu, o unu segretu de importu cun petzi sos amigos tuos. Tenes tue su controllu."
+      diaspora_site_link: "retza federada de diaspora*"
       headline: "Bene bènnidu in %{pod_name}"
       own_your_data: "Sos datos tuos sunt petzi tuos"
       own_your_data_info: "Medas retzas sotziales impreant sos datos tuos pro fàghere dinare analizende sas interatziones tuas pro ti bèndere cosa. diaspora* no impreat sos datos tuos pro cale si siat punna chi non siet sa de ti permìtere de ti connètere e de cumpartzire cun sos àteros."
+      part_of_diaspora: "Parte de su %{diaspora_site_link}"
     podmin:
       byline: "Istas pro cambiare ìnternet. Incumintzamus, ite naras?"
       configuration_info: "Aberi %{database_path} e %{diaspora_path} in s'editore de testu preferidu dae tie e revisiona·los cun atentzione. Sunt cummentados estensivamente."
@@ -989,6 +991,11 @@ sc:
       updated: "Profilu agiornadu"
   public: "Pùblicu"
   registrations:
+    closed:
+      another_pod: "un'àteru pod"
+      closed_pod: "Custu pod est, in custu momentu, serradu pro sas registratziones noas. Nointames, ti podes aunire su matessi a sa retza de diaspora* registrende·ti in %{wiki}. Essende totu sos pods connessos intre issos, as a tènnere atzessu a sos matessi cuntenutos in cue."
+      find_pods: "Podes agatare una lista de pods in ue ti podes registrare in %{poduptime}"
+      other_questions: "Si tenes cale si siat àtera pregunta chi pertocat a s'issèberu de unu pod, leghe·ti sa %{wiki} nostra"
     create:
       success: "Ti ses registradu in diaspora*!"
     invalid_invite: "Su ligàmene de invitu chi as impreadu no est prus vàlidu!"
@@ -1175,6 +1182,41 @@ sc:
         one: "1 persone etichetadas cun %{tag}"
         other: "%{count} persones etichetadas cun %{tag}"
         zero: "Nemos etichetadu cun %{tag}"
+  two_factor_auth:
+    activated:
+      change_button: "Disativa"
+      change_label: "Disativa s'autenticatzione in duas fases insertende sa crae de intrada tua"
+      status: "Autenticatzione in duas fases ativada"
+    confirm:
+      activate_button: "Cunfirma e ativa"
+      input_explanation: "A pustis de s'iscansidura o de s'insertadura de su còdighe segretu, inserta su còdighe de ses tzifras chi as a bìdere e cunfirma s'impostatzione."
+      input_title: "Cunfirma cun unu getone TOTP"
+      manual_explanation: "S'in casu mai non potzas iscansire su còdighe QR in manera automàtica podes insertare su còdighe segretu manualmente in s'aplicatzione."
+      manual_explanation_cont: "Semus impreende craes de intrada bàlidas pro una borta ebbia (TOTP) basadas subra su tempus cun getones a ses tzifras. S'in casu mai s'aplicatzione tua ti pedat un'intervallu de tempus e un's'algoritmu, inserta pare-pare 30 segundos e sha1. <br /> Sos ispàtzios bi sunt pro leghibilidade ebbia, inserta su còdighe chene de issos."
+      scan_explanation: "Pro praghere iscansi su còdighe QR cun un'aplicatzione cun capatzidade TOTP, che a andOTP (Android), FreeOTP (iOS), SailOTP (SailfishOS)."
+      scan_title: "Iscansi su còdighe QR"
+      status: "S'autenticatzione in duas fases no est galu ativada de su totu, depes cunfirmare s'ativatzione cun unu getone TOTP"
+      title: "Cunfirma s'ativatzione"
+    deactivated:
+      change_button: "Ativa"
+      change_label: "Ativa s'autenticatzione in duas fases"
+      status: "Autenticatzione in duas fases disativada"
+    explanation: "S'autenticatzione in duas fases est una manera poderosa pro t'assegurare de èssere s'ùnicu in gradu de atzèdere a su contu tuo. Cando faghes s'atzessu, inserta unu còdighe de 6 tzifras in paris cun sa crae tua pro dimustrare s'identidade tua. Dae cara: si perdes su telèfonu e sos còdighes de riprìstinu creados cando ativas custa funtzionalidade, as a tènnere s'atzessu a su contu de diaspora* tuo blocadu pro semper."
+    flash:
+      error_token: "Su getone fiat non curretu o non vàlidu"
+      success_activation: "Autenticatzione in duas fases ativada chene problemas"
+      success_deactivation: "Autenticatzione in duas fases disativada chene problemas"
+    input_token:
+      label: "Getone in duas fases"
+      placeholder: "getone in duas fases a ses tzifras"
+    recovery:
+      button: "Ingendra còdighes de recùperu noos"
+      explanation: "S'in casu mai as a pèrdere s'atzessu a su telèfonu tuo as a pòdere impreare unu de sos còdighes de recùperu inoghe in suta pro torrare a otènnere s'atzessu a su contu tuo. Ampara bene sos còdighes de recùperu. Pro fàghere un'esèmpiu, los dias pòdere imprentare e pònnere cun àteros documentos de importu."
+      explanation_short: "Sos còdighes de recùperu ti permitint de torrare a otènnere s'atzessu a su contu tuo si as pèrdidu su telèfonu tuo. Ammenta·ti chi podes impreare cada còdighe de recùperu una borta ebbia."
+      invalidation_notice: "Si as pèrdidu sos còdighes de recùperu tuos, los podes torrare a ingendrare inoghe. Sos còdighes de recùperu betzos ant a èssere invalidados."
+      reminder: "Si nono, podes impreare unu de sos còdighes de recùperu."
+      title: "Còdighes de recùperu"
+    title: "Autenticatzione in duas fases"
   username: "Nùmene impreadore"
   users:
     confirm_email:
diff --git a/config/locales/diaspora/th.yml b/config/locales/diaspora/th.yml
index 9f373a209..c928a3350 100644
--- a/config/locales/diaspora/th.yml
+++ b/config/locales/diaspora/th.yml
@@ -16,6 +16,7 @@ th:
   cancel: "ยกเลิก"
   delete: "ลบ"
   email: "อีเมล"
+  fill_me_out: "โปรดเติมข้อมูลให้สมบูรณ์"
   limited: "จำกัดการเข้าถึง"
   ok: "ตกลง"
   privacy: "ส่วนตัว"
diff --git a/config/locales/javascript/javascript.et.yml b/config/locales/javascript/javascript.et.yml
index 57ccdf050..d5b2a5e1b 100644
--- a/config/locales/javascript/javascript.et.yml
+++ b/config/locales/javascript/javascript.et.yml
@@ -43,7 +43,13 @@ et:
     show_more: "näita veel"
     stream:
       comment: "Kommenteeri"
+      disable_post_notifications: "Lülita selle postituse teavitused välja"
+      enable_post_notifications: "Lülita selle postituse teavitused sisse"
       follow: "Jälgi"
+      followed_tag:
+        add_a_tag: "Lisa silt"
+        follow: "Jälgi"
+        title: "#Jälgitavad sildid"
       hide: "Peida"
       hide_nsfw_posts: "Peida #nsfw postitused"
       like: "Meeldib"
@@ -56,7 +62,9 @@ et:
         one: "Näita veel <%= count %> kommentaari"
         other: "Näita veel <%= count %> kommentaari"
         zero: "Näita veel <%= count %> kommentaari"
+      no_posts_yet: "Ei ole veel kuvamiseks postitusi."
       original_post_deleted: "Postitus on autori poolt eemaldatud."
+      permalink: "Püsiviide"
       public: "Avalik"
       reshare: "Jaga edasi"
       reshares:
@@ -65,6 +73,11 @@ et:
         zero: "<%= count %> edasijagamist"
       show_nsfw_post: "Näita postitust"
       show_nsfw_posts: "Näita kõiki"
+      tags:
+        follow: "Jälgi #<%= tag %>"
+        following: "Jälgin #<%= tag %>"
+        stop_following: "Lõpeta #<%= tag %> jälgimine"
+        stop_following_confirm: "Lõpeta sildi #<%= tag %> jälgimine?"
       unfollow: "Lõpeta jälgimine"
       unlike: "Ei meeldi"
     tags:
diff --git a/spec/integration/tag_people_spec.rb b/spec/integration/tag_people_spec.rb
index ea8174e05..09ea0cb5b 100644
--- a/spec/integration/tag_people_spec.rb
+++ b/spec/integration/tag_people_spec.rb
@@ -14,7 +14,7 @@ describe TagsController, type: :request do
       get "/tags/#{tag}"
 
       expect(response.status).to eq(200)
-      expect(response.body).to match(/div class="pagination"/)
+      expect(response.body).to match(/class="pagination"/)
       expect(response.body).to match(/href="\/tags\/#{tag}\?page=2"/)
     end
 
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index c1a83f13f..f0cafecf1 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -124,6 +124,18 @@ describe Profile, :type => :model do
     end
   end
 
+  describe "of gender" do
+    it "can be 255 characters long" do
+      profile = FactoryGirl.build(:profile, gender: "a" * 255)
+      expect(profile).to be_valid
+    end
+
+    it "cannot be 256 characters" do
+      profile = FactoryGirl.build(:profile, gender: "a" * 256)
+      expect(profile).not_to be_valid
+    end
+  end
+
   describe "image_url setters" do
     %i(image_url image_url_small image_url_medium).each do |method|
       describe "##{method}=" do