Merge branch 'release/0.6.6.0'v0.6.6.0

108 files changed, 977 insertions, 1376 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 2ebb26cff..36e1043e3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -164,6 +164,16 @@ Lint/Debugger:
 Style/NumericPredicate:
   EnforcedStyle: comparison
 
+# Old defaults from rubocop < 0.48.1
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: '()'
+    '%i': '()'
+    '%I': '()'
+    '%r': '{}'
+    '%w': '()'
+    '%W': '()'
+
 # Reset some HoundCI changes back to Rubocop defaults
 Style/DotPosition:
   EnforcedStyle: leading
diff --git a/Changelog.md b/Changelog.md
index 293e08f69..af4994a01 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,20 @@
+# 0.6.6.0
+
+## Refactor
+* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
+* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
+
+## Bug fixes
+* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)
+* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)
+* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)
+* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)
+* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
+
+## Features
+
+* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)
+
 # 0.6.5.0
 
 ## Refactor
diff --git a/Gemfile b/Gemfile
index 1fb74a0e1..2dbce35e2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
 
 # Federation
 
-gem "diaspora_federation-rails", "0.1.8"
+gem "diaspora_federation-rails", "0.1.9"
 
 # API and JSON
 
@@ -132,7 +132,7 @@ gem "leaflet-rails",       "0.7.7"
 
 # Parsing
 
-gem "nokogiri",          "1.7.1"
+gem "nokogiri",          "1.7.2"
 gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
 gem "redcarpet",         "3.4.0"
 gem "ruby-oembed",       "0.10.1"
@@ -183,8 +183,8 @@ gem "typhoeus",           "1.1.2"
 gem "gon",                     "6.1.0"
 gem "hamlit",                  "2.8.0"
 gem "mobile-fu",               "1.3.1"
+gem "rails-timeago",           "2.16.0"
 gem "will_paginate",           "3.1.5"
-gem "rails-timeago",           "2.11.0"
 
 # Logging
 
@@ -217,10 +217,6 @@ gem "thor", "0.19.1"
 # gem "therubyracer", :platform => :ruby
 
 group :production do # we don"t install these on travis to speed up test runs
-  # Administration
-
-  gem "rails_admin", "0.8.1"
-
   # Analytics
 
   gem "rack-google-analytics", "1.2.0"
@@ -250,13 +246,13 @@ group :development do
   gem "rb-inotify",     "0.9.8", require: false
 
   # Linters
-  gem "haml_lint",      "0.21.0"
-  gem "pronto",         "0.8.2"
-  gem "pronto-eslint",  "0.8.0"
-  gem "pronto-haml",    "0.8.0"
-  gem "pronto-rubocop", "0.8.0"
-  gem "pronto-scss",    "0.8.0", require: false
-  gem "rubocop",        "0.47.1"
+  gem "haml_lint",      "0.24.0", require: false
+  gem "pronto",         "0.9.3", require: false
+  gem "pronto-eslint",  "0.9.1", require: false
+  gem "pronto-haml",    "0.9.0", require: false
+  gem "pronto-rubocop", "0.9.0", require: false
+  gem "pronto-scss",    "0.9.1", require: false
+  gem "rubocop",        "0.48.1", require: false
 
   # Preloading environment
 
@@ -296,7 +292,7 @@ group :test do
   gem "webmock",            "2.3.2", require: false
   gem "shoulda-matchers",   "3.1.1"
 
-  gem "diaspora_federation-test", "0.1.8"
+  gem "diaspora_federation-test", "0.1.9"
 
   # Coverage
   gem 'coveralls', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 3241688a5..499e6582c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -104,13 +104,6 @@ GEM
     chunky_png (1.3.8)
     cliver (0.3.2)
     coderay (1.1.1)
-    coffee-rails (4.2.1)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.12.2)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -170,17 +163,17 @@ GEM
       devise
       rails (>= 3.0.4)
     diaspora-prosody-config (0.0.7)
-    diaspora_federation (0.1.8)
+    diaspora_federation (0.1.9)
       faraday (>= 0.9.0, < 0.12.0)
       faraday_middleware (>= 0.10.0, < 0.12.0)
       nokogiri (~> 1.6, >= 1.6.8)
       typhoeus (~> 1.0)
       valid (~> 1.0)
-    diaspora_federation-rails (0.1.8)
-      diaspora_federation (= 0.1.8)
+    diaspora_federation-rails (0.1.9)
+      diaspora_federation (= 0.1.9)
       rails (>= 4.2, < 6)
-    diaspora_federation-test (0.1.8)
-      diaspora_federation (= 0.1.8)
+    diaspora_federation-test (0.1.9)
+      diaspora_federation (= 0.1.9)
       factory_girl (~> 4.7)
       uuid (~> 2.3.8)
     diff-lcs (1.3)
@@ -217,7 +210,7 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.17)
+    ffi (1.9.18)
     fixture_builder (0.4.1)
       activerecord (>= 2)
       activesupport (>= 2)
@@ -236,17 +229,15 @@ GEM
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.7.0.1)
-      railties (>= 3.2, < 5.1)
     formatador (0.2.5)
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     get_process_mem (0.2.1)
     gherkin (4.0.0)
-    gitlab (3.7.0)
-      httparty (~> 0.13.0)
-      terminal-table
+    gitlab (4.0.0)
+      httparty
+      terminal-table (= 1.7.1)
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     gon (6.1.0)
@@ -277,8 +268,9 @@ GEM
       rubocop (~> 0.20)
     haml (4.0.7)
       tilt
-    haml_lint (0.21.0)
-      haml (~> 4.0)
+    haml_lint (0.24.0)
+      haml (>= 4.0, < 5.1)
+      rainbow
       rake (>= 10, < 13)
       rubocop (>= 0.47.0)
       sysexits (~> 1.1)
@@ -305,8 +297,7 @@ GEM
     http-form_data (1.0.1)
     http_accept_language (2.1.0)
     http_parser.rb (0.6.0)
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
     i18n (0.8.1)
@@ -347,9 +338,6 @@ GEM
     jsonpath (0.5.8)
       multi_json
     jwt (1.5.6)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
     kgio (2.11.0)
     leaflet-rails (0.7.7)
     listen (3.1.5)
@@ -390,9 +378,8 @@ GEM
     mysql2 (0.4.5)
     naught (1.1.0)
     nenv (0.3.0)
-    nested_form (0.3.2)
     nio4r (2.0.0)
-    nokogiri (1.7.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -404,7 +391,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (1.4.2)
       hashie (>= 1.2, < 4)
@@ -449,24 +436,24 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    pronto (0.8.2)
-      gitlab (~> 3.6, >= 3.4.0)
+    pronto (0.9.3)
+      gitlab (~> 4.0, >= 4.0.0)
       httparty (>= 0.13.7, < 0.15)
-      octokit (~> 4.3, >= 4.1.0)
+      octokit (~> 4.7, >= 4.7.0)
       rainbow (~> 2.1)
       rugged (~> 0.24, >= 0.23.0)
       thor (~> 0.19.0)
-    pronto-eslint (0.8.0)
+    pronto-eslint (0.9.1)
       eslintrb (~> 2.0, >= 2.0.0)
-      pronto (~> 0.8.0)
-    pronto-haml (0.8.0)
-      haml_lint (~> 0.16, >= 0.15.0)
-      pronto (~> 0.8.0)
-    pronto-rubocop (0.8.0)
-      pronto (~> 0.8.0)
+      pronto (~> 0.9.0)
+    pronto-haml (0.9.0)
+      haml_lint (~> 0.23)
+      pronto (~> 0.9.0)
+    pronto-rubocop (0.9.0)
+      pronto (~> 0.9.0)
       rubocop (~> 0.38, >= 0.35.0)
-    pronto-scss (0.8.0)
-      pronto (~> 0.8.0)
+    pronto-scss (0.9.1)
+      pronto (~> 0.9.0)
       scss_lint (~> 0.43, >= 0.43.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
@@ -492,9 +479,6 @@ GEM
       multi_json (>= 1.3.6)
       rack (>= 1.1)
     rack-piwik (0.3.0)
-    rack-pjax (0.8.0)
-      nokogiri (~> 1.5)
-      rack (~> 1.1)
     rack-protection (1.5.3)
       rack
     rack-rewrite (1.5.1)
@@ -568,29 +552,16 @@ GEM
     rails-i18n (4.0.8)
       i18n (~> 0.7)
       railties (~> 4.0)
-    rails-timeago (2.11.0)
+    rails-timeago (2.16.0)
       actionpack (>= 3.1)
       activesupport (>= 3.1)
-    rails_admin (0.8.1)
-      builder (~> 3.1)
-      coffee-rails (~> 4.0)
-      font-awesome-rails (>= 3.0, < 5)
-      haml (~> 4.0)
-      jquery-rails (>= 3.0, < 5)
-      jquery-ui-rails (~> 5.0)
-      kaminari (~> 0.14)
-      nested_form (~> 0.3)
-      rack-pjax (~> 0.7)
-      rails (~> 4.0)
-      remotipart (~> 1.0)
-      safe_yaml (~> 1.0)
-      sass-rails (>= 4.0, < 6)
     railties (4.2.8)
       actionpack (= 4.2.8)
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.1)
+    rainbow (2.2.2)
+      rake
     raindrops (0.17.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
@@ -600,7 +571,6 @@ GEM
     redis (3.3.3)
     redis-namespace (1.5.3)
       redis (~> 3.0, >= 3.0.4)
-    remotipart (1.3.1)
     request_store (1.3.2)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
@@ -625,7 +595,7 @@ GEM
       rspec-mocks (~> 3.5.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    rubocop (0.47.1)
+    rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -649,7 +619,7 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    scss_lint (0.52.0)
+    scss_lint (0.53.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
     secure_headers (3.6.1)
@@ -708,7 +678,7 @@ GEM
     temple (0.8.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    terminal-table (1.7.3)
+    terminal-table (1.7.1)
       unicode-display_width (~> 1.1.1)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
@@ -734,7 +704,7 @@ GEM
       unf (~> 0.1.0)
     typhoeus (1.1.2)
       ethon (>= 0.9.0)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (3.1.2)
       execjs (>= 0.3.0, < 3)
@@ -805,8 +775,8 @@ DEPENDENCIES
   devise (= 4.2.0)
   devise_lastseenable (= 0.0.6)
   diaspora-prosody-config (= 0.0.7)
-  diaspora_federation-rails (= 0.1.8)
-  diaspora_federation-test (= 0.1.8)
+  diaspora_federation-rails (= 0.1.9)
+  diaspora_federation-test (= 0.1.9)
   entypo-rails (= 3.0.0)
   eye (= 0.9.1)
   factory_girl_rails (= 4.8.0)
@@ -821,7 +791,7 @@ DEPENDENCIES
   guard-cucumber (= 2.1.2)
   guard-rspec (= 4.7.3)
   guard-rubocop (= 1.2.0)
-  haml_lint (= 0.21.0)
+  haml_lint (= 0.24.0)
   hamlit (= 2.8.0)
   handlebars_assets (= 0.23.1)
   http_accept_language (= 2.1.0)
@@ -841,7 +811,7 @@ DEPENDENCIES
   minitest
   mobile-fu (= 1.3.1)
   mysql2 (= 0.4.5)
-  nokogiri (= 1.7.1)
+  nokogiri (= 1.7.2)
   omniauth (= 1.4.2)
   omniauth-facebook (= 4.0.0)
   omniauth-tumblr (= 1.2)
@@ -851,11 +821,11 @@ DEPENDENCIES
   openid_connect (= 0.12.0)
   pg (= 0.19.0)
   poltergeist (= 1.13.0)
-  pronto (= 0.8.2)
-  pronto-eslint (= 0.8.0)
-  pronto-haml (= 0.8.0)
-  pronto-rubocop (= 0.8.0)
-  pronto-scss (= 0.8.0)
+  pronto (= 0.9.3)
+  pronto-eslint (= 0.9.1)
+  pronto-haml (= 0.9.0)
+  pronto-rubocop (= 0.9.0)
+  pronto-scss (= 0.9.1)
   pry
   pry-byebug
   quiet_assets (= 1.1.0)
@@ -886,14 +856,13 @@ DEPENDENCIES
   rails-assets-markdown-it-sup (= 1.0.0)!
   rails-assets-perfect-scrollbar (= 0.6.16)!
   rails-i18n (= 4.0.8)
-  rails-timeago (= 2.11.0)
-  rails_admin (= 0.8.1)
+  rails-timeago (= 2.16.0)
   rb-fsevent (= 0.9.8)
   rb-inotify (= 0.9.8)
   redcarpet (= 3.4.0)
   responders (= 2.3.0)
   rspec-rails (= 3.5.2)
-  rubocop (= 0.47.1)
+  rubocop (= 0.48.1)
   ruby-oembed (= 0.10.1)
   rubyzip (= 1.2.1)
   sass-rails (= 5.0.6)
diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js
index 841952112..26541c794 100644
--- a/app/assets/javascripts/app/views/publisher/uploader_view.js
+++ b/app/assets/javascripts/app/views/publisher/uploader_view.js
@@ -14,6 +14,9 @@ app.views.PublisherUploader = Backbone.View.extend({
       element: this.el,
       button: this.el,
 
+      text: {
+        fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+      },
       request: {
         endpoint: Routes.photos(),
         params: {
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index e8840b6dc..c754c5686 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -9,7 +9,7 @@
 //= require autosize
 //= require charcount
 //= require jquery-placeholder
-//= require rails-timeago
+//= require jquery.timeago
 //= require jquery-ui/core
 //= require jquery-ui/widget
 //= require jquery-ui/mouse
diff --git a/app/assets/javascripts/mobile/mobile.js b/app/assets/javascripts/mobile/mobile.js
index c7259edda..f0fb64c39 100644
--- a/app/assets/javascripts/mobile/mobile.js
+++ b/app/assets/javascripts/mobile/mobile.js
@@ -11,7 +11,7 @@
 //= require keycodes
 //= require jquery.autoSuggest.custom
 //= require fine-uploader/fine-uploader.core
-//= require rails-timeago
+//= require jquery.timeago
 //= require underscore
 //= require bootstrap
 //= require diaspora
diff --git a/app/assets/javascripts/mobile/mobile_comments.js b/app/assets/javascripts/mobile/mobile_comments.js
index 0861ec0f2..49858bc1c 100644
--- a/app/assets/javascripts/mobile/mobile_comments.js
+++ b/app/assets/javascripts/mobile/mobile_comments.js
@@ -201,7 +201,7 @@
     increaseReactionCount: function(bottomBar) {
       var toggleReactionsLink = bottomBar.find(".show-comments").first();
       var count = toggleReactionsLink.text().match(/.*(\d+).*/);
-      count = parseInt(count, 10);
+      count = parseInt(count, 10) || 0;
       var text = Diaspora.I18n.t("stream.comments", {count: count + 1});
 
       // No previous comment
diff --git a/app/assets/javascripts/mobile/mobile_file_uploader.js b/app/assets/javascripts/mobile/mobile_file_uploader.js
index 3b5f996a7..86c784818 100644
--- a/app/assets/javascripts/mobile/mobile_file_uploader.js
+++ b/app/assets/javascripts/mobile/mobile_file_uploader.js
@@ -23,6 +23,9 @@ function createUploader(){
       sizeLimit: 4194304
     },
     button: document.getElementById("file-upload-publisher"),
+    text: {
+      fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
+    },
 
     callbacks: {
       onProgress: function(id, fileName, loaded, total) {
diff --git a/app/assets/javascripts/widgets/timeago.js b/app/assets/javascripts/widgets/timeago.js
index 4d159818f..a0bfd010a 100644
--- a/app/assets/javascripts/widgets/timeago.js
+++ b/app/assets/javascripts/widgets/timeago.js
@@ -26,6 +26,12 @@
           }
         });
       }
+
+      $.timeago.settings.autoDispose = false;
+
+      $(function() {
+        $("time[data-time-ago]").timeago();
+      });
     });
   };
 })();
diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
index 75d051777..dd96957c5 100644
--- a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
@@ -39,11 +39,11 @@
             {{/if}}
             <span class="post-time">
               {{#if root}}
-                <a href="/posts/{{root.id}}">
+                <a href="/posts/{{root.guid}}">
                   <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
                 </a>
               {{else}}
-                <a href="/posts/{{id}}">
+                <a href="/posts/{{guid}}">
                   <time datetime="{{created_at}}" title="{{localTime created_at}}" />
                 </a>
               {{/if}}
@@ -91,7 +91,7 @@
           </span>
           <div class="post-context">
             <span class="post-time">
-              <a href="/posts/{{id}}">
+              <a href="/posts/{{guid}}">
                 <time datetime="{{created_at}}" title="{{localTime created_at}}" />
               </a>
             </span>
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index 6347b73fc..bfba508f7 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -24,7 +24,7 @@
             <time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />
           </a>
 
-          <a href="/posts/{{id}}" class="permalink" title="{{t "stream.permalink"}}">
+          <a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">
             <i class="entypo-link"></i>
           </a>
         {{/if}}
diff --git a/app/helpers/activity_streams_helper.rb b/app/helpers/activity_streams_helper.rb
new file mode 100644
index 000000000..b08514404
--- /dev/null
+++ b/app/helpers/activity_streams_helper.rb
@@ -0,0 +1,12 @@
+module ActivityStreamsHelper
+  def add_activitystreams_author(target, person)
+    target.author do |author|
+      author.name person.name
+      author.uri local_or_remote_person_path(person, absolute: true)
+
+      author.tag! "activity:object-type", "http://activitystrea.ms/schema/1.0/person"
+      author.tag! "poco:preferredUsername", person.username
+      author.tag! "poco:displayName", person.name
+    end
+  end
+end
diff --git a/app/models/person.rb b/app/models/person.rb
index 1f86c28bc..f4a5202ad 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -229,6 +229,8 @@ class Person < ActiveRecord::Base
 
   def public_key
     OpenSSL::PKey::RSA.new(serialized_public_key)
+  rescue OpenSSL::PKey::RSAError
+    nil
   end
 
   def exported_key
diff --git a/app/models/user.rb b/app/models/user.rb
index e8a09a322..55fd554c5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -431,6 +431,7 @@ class User < ActiveRecord::Base
     return unless AppConfig.settings.welcome_message.enabled? && AppConfig.admins.account?
     sender_username = AppConfig.admins.account.get
     sender = User.find_by(username: sender_username)
+    return if sender.nil?
     conversation = sender.build_conversation(
       participant_ids: [sender.person.id, person.id],
       subject:         AppConfig.settings.welcome_message.subject.get,
diff --git a/app/presenters/node_info_presenter.rb b/app/presenters/node_info_presenter.rb
index a52668b7f..1167ab5ea 100644
--- a/app/presenters/node_info_presenter.rb
+++ b/app/presenters/node_info_presenter.rb
@@ -17,17 +17,17 @@ class NodeInfoPresenter
   end
 
   def add_configuration(doc)
-    doc.software.version     = version
-    doc.services.outbound    = available_services
-    doc.open_registrations   = open_registrations?
-    doc.metadata["nodeName"] = name
-    doc.metadata["xmppChat"] = chat_enabled?
+    doc.software.version         = version
+    doc.services.outbound        = available_services
+    doc.open_registrations       = open_registrations?
+    doc.metadata["nodeName"]     = name
+    doc.metadata["xmppChat"]     = chat_enabled?
+    doc.metadata["adminAccount"] = admin_account
   end
 
   def add_static_data(doc)
     doc.software.name = "diaspora"
-    doc.protocols.inbound << "diaspora"
-    doc.protocols.outbound << "diaspora"
+    doc.protocols.protocols << "diaspora"
   end
 
   def add_user_counts(doc)
@@ -71,6 +71,10 @@ class NodeInfoPresenter
     AppConfig.chat.enabled?
   end
 
+  def admin_account
+    AppConfig.admins.account if AppConfig.admins.account?
+  end
+
   def available_services
     Configuration::KNOWN_SERVICES.select {|service|
       AppConfig.show_service?(service, nil)
diff --git a/app/views/publisher/_publisher.html.haml b/app/views/publisher/_publisher.html.haml
index 1304283a4..1d545dd17 100644
--- a/app/views/publisher/_publisher.html.haml
+++ b/app/views/publisher/_publisher.html.haml
@@ -30,7 +30,7 @@
             .publisher-buttonbar#publisher-images
               .btn.btn-link.poll-creator#poll_creator{title: t("shared.publisher.poll.add_a_poll")}
                 %i.entypo-bar-graph
-              .btn.btn-link.file-upload#file-upload{title: t("shared.publisher.upload_photos")}
+              .btn.btn-link.file-upload#file-upload
                 %i.entypo-camera.publisher_image
               .btn.btn-link.locator#locator{title: t("shared.publisher.get_location")}
                 %i.entypo-location.publisher_image
diff --git a/app/views/publisher/_publisher.mobile.haml b/app/views/publisher/_publisher.mobile.haml
index 4399b7c13..dd6bcf2b7 100644
--- a/app/views/publisher/_publisher.mobile.haml
+++ b/app/views/publisher/_publisher.mobile.haml
@@ -31,7 +31,7 @@
       %ul#photodropzone
     #fileInfo-publisher
 
-    #file-upload-publisher{title: t('shared.publisher.upload_photos'), class: 'btn btn-default'}
+    #file-upload-publisher{class: "btn btn-default"}
       %i.entypo-camera.middle
     #publisher_mobile
       = submit_tag t("shared.publisher.share"),
diff --git a/app/views/users/public.atom.builder b/app/views/users/public.atom.builder
index e5bfb6da8..790f6f21a 100644
--- a/app/views/users/public.atom.builder
+++ b/app/views/users/public.atom.builder
@@ -17,21 +17,16 @@ atom_feed("xmlns:thr"       => "http://purl.org/syndication/thread/1.0",
 	    'media:height' => '100', :href => "#{@user.image_url}"
   feed.tag! :link, :href => "#{AppConfig.environment.pubsub_server}", :rel => 'hub'
 
-  feed.author do |author|
-    author.name @user.name
-    author.uri local_or_remote_person_path(@user.person, :absolute => true)
-
-    author.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/person'
-    author.tag! 'poco:preferredUsername', @user.username
-    author.tag! 'poco:displayName', @user.name
-  end
+  add_activitystreams_author(feed, @user.person)
 
   @posts.each do |post|
     feed.entry post, :url => "#{@user.url}p/#{post.id}",
       :id => "#{@user.url}p/#{post.id}" do |entry|
 
-      entry.title post.message.title
+      entry.title post_page_title(post)
       entry.content post.message.markdownified(disable_hovercards: true), :type => 'html'
+      add_activitystreams_author(entry, post.author)
+
       entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post'
       entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note'
     end
diff --git a/config/defaults.yml b/config/defaults.yml
index 4a7730885..d6462d3f6 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.6.5.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.6.6.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/diaspora.yml.example b/config/diaspora.yml.example
index 7d8b99ee6..a5c2cdc51 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -82,7 +82,7 @@ configuration: ## Section
       ## Number of times a job is retried (default=10).
       ## There's an exponential effect to this: if you set this too high you
       ## might get too many jobs building up in the queue.
-      ## Set it to false to disable it completely.
+      ## Set it to 0 to disable it completely.
       #retry: 10
 
       ## Lines of backtrace that are stored on failure (default=15).
diff --git a/config/initializers/diaspora_federation.rb b/config/initializers/diaspora_federation.rb
index 49ff3da6c..aff729ec4 100644
--- a/config/initializers/diaspora_federation.rb
+++ b/config/initializers/diaspora_federation.rb
@@ -72,8 +72,7 @@ DiasporaFederation.configure do |config|
     end
 
     on :fetch_public_key do |diaspora_id|
-      key = Person.find_or_fetch_by_identifier(diaspora_id).serialized_public_key
-      OpenSSL::PKey::RSA.new(key) unless key.nil?
+      Person.find_or_fetch_by_identifier(diaspora_id).public_key
     end
 
     on :fetch_related_entity do |entity_type, guid|
diff --git a/config/initializers/rails_admin.rb b/config/initializers/rails_admin.rb
deleted file mode 100644
index 158aa991f..000000000
--- a/config/initializers/rails_admin.rb
+++ /dev/null
@@ -1,1093 +0,0 @@
-# RailsAdmin config file. Generated on March 24, 2012 15:34
-# See github.com/sferik/rails_admin for more informations
-if Rails.env.production?
-  # Recommended way to deal with Kaminari vs. WillPaginate issues
-  if defined?(WillPaginate)
-    Kaminari.configure do |config|
-      config.page_method_name = :per_page_kaminari
-    end
-  end
-  RailsAdmin.config do |config|
-    config.authorize_with do
-      redirect_to main_app.root_path unless current_user.try(:admin?)
-    end
-
-    # If your default_local is different from :en, uncomment the following 2 lines and set your default locale here:
-    # require 'i18n'
-    # I18n.default_locale = :de
-
-    config.current_user_method { current_user } # auto-generated
-
-    # If you want to track changes on your models:
-    # config.audit_with :history, User
-
-    # Or with a PaperTrail: (you need to install it first)
-    # config.audit_with :paper_trail, User
-
-    # Set the admin name here (optional second array element will appear in a beautiful RailsAdmin red ©)
-    config.main_app_name = ['Diaspora', 'Admin']
-    # or for a dynamic name:
-    # config.main_app_name = Proc.new { |controller| [Rails.application.engine_name.titleize, controller.params['action'].titleize] }
-
-
-    #  ==> Global show view settings
-    # Display empty fields in show views
-    # config.compact_show_view = false
-
-    #  ==> Global list view settings
-    # Number of default rows per-page:
-    # config.default_items_per_page = 20
-
-    #  ==> Included models
-    # Add all excluded models here:
-    #config.excluded_models = []
-
-    # Add models here if you want to go 'whitelist mode':
-    config.included_models = %w[
-        AccountDeletion
-        Aspect
-        AspectMembership
-        Block
-        Comment
-        Contact
-        Conversation
-        Invitation
-        InvitationCode
-        Like
-        Location
-        Mention
-        Message
-        OEmbedCache
-        OpenGraphCache
-        Person
-        Photo
-        Profile
-        Pod
-        Poll
-        PollAnswer
-        Post
-        Profile
-        Report
-        Reshare
-        Role
-        Service
-        StatusMessage
-        User
-        UserPreference
-    ]
-
-    # Application wide tried label methods for models' instances
-    # config.label_methods << :description # Default is [:name, :title]
-
-    #  ==> Global models configuration
-    # config.models do
-    #   # Configuration here will affect all included models in all scopes, handle with care!
-    #
-    #   list do
-    #     # Configuration here will affect all included models in list sections (same for show, export, edit, update, create)
-    #
-    #     fields_of_type :date do
-    #       # Configuration here will affect all date fields, in the list section, for all included models. See README for a comprehensive type list.
-    #     end
-    #   end
-    # end
-    #
-    #  ==> Model specific configuration
-    # Keep in mind that *all* configuration blocks are optional.
-    # RailsAdmin will try his best to provide the best defaults for each section, for each field.
-    # Try to override as few things as possible, in the most generic way. Try to avoid setting labels for models and attributes, use ActiveRecord I18n API instead.
-    # Less code is better code!
-    # config.model MyModel do
-    #   # Cross-section field configuration
-    #   object_label_method :name     # Name of the method called for pretty printing an *instance* of ModelName
-    #   label 'My model'              # Name of ModelName (smartly defaults to ActiveRecord's I18n API)
-    #   label_plural 'My models'      # Same, plural
-    #   weight -1                     # Navigation priority. Bigger is higher.
-    #   parent OtherModel             # Set parent model for navigation. MyModel will be nested below. OtherModel will be on first position of the dropdown
-    #   navigation_label              # Sets dropdown entry's name in navigation. Only for parents!
-    #   # Section specific configuration:
-    #   list do
-    #     filters [:id, :name]  # Array of field names which filters should be shown by default in the table header
-    #     items_per_page 100    # Override default_items_per_page
-    #     sort_by :id           # Sort column (default is primary key)
-    #     sort_reverse true     # Sort direction (default is true for primary key, last created first)
-    #     # Here goes the fields configuration for the list view
-    #   end
-    # end
-
-    # Your model's configuration, to help you get started:
-
-    # All fields marked as 'hidden' won't be shown anywhere in the rails_admin unless you mark them as visible. (visible(true))
-
-    # config.model AccountDeletion do
-    #   # Found associations:
-    #     configure :person, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :diaspora_handle, :string
-    #     configure :person_id, :integer         # Hidden   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-
-    # config.model ActsAsTaggableOn::Tag do
-    #   # Found associations:
-    #     configure :taggings, :has_many_association         # Hidden   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :name, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Aspect do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :aspect_memberships, :has_many_association
-    #     configure :contacts, :has_many_association
-    #     configure :aspect_visibilities, :has_many_association
-    #     configure :posts, :has_many_association
-    #     configure :photos, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :name, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :contacts_visible, :boolean
-    #     configure :order_id, :integer   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model AspectMembership do
-    #   # Found associations:
-    #     configure :aspect, :belongs_to_association
-    #     configure :contact, :belongs_to_association
-    #     configure :user, :has_one_association
-    #     configure :person, :has_one_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :aspect_id, :integer         # Hidden
-    #     configure :contact_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model AspectVisibility do
-    #   # Found associations:
-    #     configure :shareable, :polymorphic_association
-    #     configure :aspect, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :shareable_id, :integer         # Hidden
-    #     configure :shareable_type, :string         # Hidden
-    #     configure :aspect_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Block do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :person, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :user_id, :integer         # Hidden
-    #     configure :person_id, :integer         # Hidden   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Comment do
-    #   # Found associations:
-    #     configure :commentable, :polymorphic_association
-    #     configure :author, :belongs_to_association
-    #     configure :likes, :has_many_association
-    #     configure :dislikes, :has_many_association
-    #     configure :taggings, :has_many_association         # Hidden
-    #     configure :base_tags, :has_many_association
-    #     configure :tag_taggings, :has_many_association         # Hidden
-    #     configure :tags, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :text, :text
-    #     configure :commentable_id, :integer         # Hidden
-    #     configure :commentable_type, :string         # Hidden
-    #     configure :author_id, :integer         # Hidden
-    #     configure :guid, :string
-    #     configure :author_signature, :text
-    #     configure :parent_author_signature, :text
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :likes_count, :integer   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Contact do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :person, :belongs_to_association
-    #     configure :aspect_memberships, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :share_visibilities, :has_many_association
-    #     configure :posts, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :user_id, :integer         # Hidden
-    #     configure :person_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :sharing, :boolean
-    #     configure :receiving, :boolean   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Conversation do
-    #   # Found associations:
-    #     configure :author, :belongs_to_association
-    #     configure :conversation_visibilities, :has_many_association
-    #     configure :participants, :has_many_association
-    #     configure :messages, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :subject, :string
-    #     configure :guid, :string
-    #     configure :author_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model ConversationVisibility do
-    #   # Found associations:
-    #     configure :conversation, :belongs_to_association
-    #     configure :person, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :conversation_id, :integer         # Hidden
-    #     configure :person_id, :integer         # Hidden
-    #     configure :unread, :integer
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Invitation do
-    #   # Found associations:
-    #     configure :sender, :belongs_to_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :aspect, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :message, :text
-    #     configure :sender_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :aspect_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :service, :string
-    #     configure :identifier, :string
-    #     configure :admin, :boolean
-    #     configure :language, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model InvitationCode do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :token, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :count, :integer
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Like do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :author, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :positive, :boolean
-    #     configure :target_id, :integer         # Hidden
-    #     configure :target_type, :string         # Hidden
-    #     configure :author_id, :integer         # Hidden
-    #     configure :guid, :string
-    #     configure :author_signature, :text
-    #     configure :parent_author_signature, :text
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Mention do
-    #   # Found associations:
-    #     configure :post, :belongs_to_association
-    #     configure :person, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :post_id, :integer         # Hidden
-    #     configure :person_id, :integer         # Hidden   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Message do
-    #   # Found associations:
-    #     configure :conversation, :belongs_to_association
-    #     configure :author, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :conversation_id, :integer         # Hidden
-    #     configure :author_id, :integer         # Hidden
-    #     configure :guid, :string
-    #     configure :text, :text
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :author_signature, :text
-    #     configure :parent_author_signature, :text   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notification do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model NotificationActor do
-    #   # Found associations:
-    #     configure :notification, :belongs_to_association
-    #     configure :person, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :notification_id, :integer         # Hidden
-    #     configure :person_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::AlsoCommented do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::CommentOnPost do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::Liked do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::Mentioned do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::PrivateMessage do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::RequestAccepted do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::Reshared do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Notifications::StartedSharing do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :recipient, :belongs_to_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :actors, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :target_type, :string         # Hidden
-    #     configure :target_id, :integer         # Hidden
-    #     configure :recipient_id, :integer         # Hidden
-    #     configure :unread, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :type, :string   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model OEmbedCache do
-    #   # Found associations:
-    #     configure :posts, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :url, :string
-    #     configure :data, :serialized   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Participation do
-    #   # Found associations:
-    #     configure :target, :polymorphic_association
-    #     configure :author, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :guid, :string
-    #     configure :target_id, :integer         # Hidden
-    #     configure :target_type, :string         # Hidden
-    #     configure :author_id, :integer         # Hidden
-    #     configure :author_signature, :text
-    #     configure :parent_author_signature, :text
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Person do
-    #   # Found associations:
-    #     configure :owner, :belongs_to_association
-    #     configure :profile, :has_one_association
-    #     configure :contacts, :has_many_association
-    #     configure :posts, :has_many_association
-    #     configure :photos, :has_many_association
-    #     configure :comments, :has_many_association
-    #     configure :participations, :has_many_association
-    #     configure :notification_actors, :has_many_association
-    #     configure :notifications, :has_many_association
-    #     configure :mentions, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :guid, :string
-    #     configure :url, :text
-    #     configure :diaspora_handle, :string
-    #     configure :serialized_public_key, :text
-    #     configure :owner_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :closed_account, :boolean   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Photo do
-    #   # Found associations:
-    #     configure :author, :belongs_to_association
-    #     configure :status_message, :belongs_to_association
-    #     configure :comments, :has_many_association
-    #     configure :aspect_visibilities, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :share_visibilities, :has_many_association
-    #     configure :contacts, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :tmp_old_id, :integer
-    #     configure :author_id, :integer         # Hidden
-    #     configure :public, :boolean
-    #     configure :diaspora_handle, :string
-    #     configure :guid, :string
-    #     configure :pending, :boolean
-    #     configure :text, :text
-    #     configure :remote_photo_path, :text
-    #     configure :remote_photo_name, :string
-    #     configure :random_string, :string
-    #     configure :processed_image, :carrierwave
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :unprocessed_image, :carrierwave
-    #     configure :status_message_guid, :string         # Hidden
-    #     configure :comments_count, :integer   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Pod do
-    #   # Found associations:
-    #   # Found columns:
-    #     configure :id, :integer
-    #     configure :host, :string
-    #     configure :ssl, :boolean
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Post do
-    #   # Found associations:
-    #     configure :author, :belongs_to_association
-    #     configure :reshares, :has_many_association
-    #     configure :o_embed_cache, :belongs_to_association
-    #     configure :likes, :has_many_association
-    #     configure :dislikes, :has_many_association
-    #     configure :comments, :has_many_association
-    #     configure :aspect_visibilities, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :share_visibilities, :has_many_association
-    #     configure :contacts, :has_many_association
-    #     configure :participations, :has_many_association
-    #     configure :mentions, :has_many_association
-    #     configure :resharers, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :author_id, :integer         # Hidden
-    #     configure :public, :boolean
-    #     configure :diaspora_handle, :string
-    #     configure :guid, :string
-    #     configure :pending, :boolean
-    #     configure :type, :string
-    #     configure :text, :text
-    #     configure :remote_photo_path, :text
-    #     configure :remote_photo_name, :string
-    #     configure :random_string, :string
-    #     configure :processed_image, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :unprocessed_image, :string
-    #     configure :object_url, :string
-    #     configure :image_url, :string
-    #     configure :image_height, :integer
-    #     configure :image_width, :integer
-    #     configure :provider_display_name, :string
-    #     configure :actor_url, :string
-    #     configure :objectId, :string
-    #     configure :root_guid, :string         # Hidden
-    #     configure :status_message_guid, :string
-    #     configure :likes_count, :integer
-    #     configure :comments_count, :integer
-    #     configure :o_embed_cache_id, :integer         # Hidden
-    #     configure :reshares_count, :integer
-    #     configure :interacted_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Profile do
-    #   # Found associations:
-    #     configure :person, :belongs_to_association
-    #     configure :taggings, :has_many_association         # Hidden
-    #     configure :base_tags, :has_many_association
-    #     configure :tag_taggings, :has_many_association         # Hidden
-    #     configure :tags, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :diaspora_handle, :string
-    #     configure :first_name, :string
-    #     configure :last_name, :string
-    #     configure :image_url, :string
-    #     configure :image_url_small, :string
-    #     configure :image_url_medium, :string
-    #     configure :birthday, :date
-    #     configure :gender, :string
-    #     configure :bio, :text
-    #     configure :searchable, :boolean
-    #     configure :person_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :location, :string
-    #     configure :full_name, :string
-    #     configure :nsfw, :boolean   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Reshare do
-    #   # Found associations:
-    #     configure :author, :belongs_to_association
-    #     configure :reshares, :has_many_association
-    #     configure :o_embed_cache, :belongs_to_association
-    #     configure :likes, :has_many_association
-    #     configure :dislikes, :has_many_association
-    #     configure :comments, :has_many_association
-    #     configure :aspect_visibilities, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :share_visibilities, :has_many_association
-    #     configure :contacts, :has_many_association
-    #     configure :participations, :has_many_association
-    #     configure :mentions, :has_many_association
-    #     configure :resharers, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :author_id, :integer         # Hidden
-    #     configure :public, :boolean
-    #     configure :diaspora_handle, :string
-    #     configure :guid, :string
-    #     configure :pending, :boolean
-    #     configure :type, :string
-    #     configure :text, :text
-    #     configure :remote_photo_path, :text
-    #     configure :remote_photo_name, :string
-    #     configure :random_string, :string
-    #     configure :processed_image, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :unprocessed_image, :string
-    #     configure :object_url, :string
-    #     configure :image_url, :string
-    #     configure :image_height, :integer
-    #     configure :image_width, :integer
-    #     configure :provider_display_name, :string
-    #     configure :actor_url, :string
-    #     configure :objectId, :string
-    #     configure :root_guid, :string         # Hidden
-    #     configure :status_message_guid, :string
-    #     configure :likes_count, :integer
-    #     configure :comments_count, :integer
-    #     configure :o_embed_cache_id, :integer         # Hidden
-    #     configure :reshares_count, :integer
-    #     configure :interacted_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Service do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :service_users, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :type, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :uid, :string
-    #     configure :access_token, :string
-    #     configure :access_secret, :string
-    #     configure :nickname, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Services::Facebook do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :service_users, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :type, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :uid, :string
-    #     configure :access_token, :string
-    #     configure :access_secret, :string
-    #     configure :nickname, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Services::Tumblr do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :service_users, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :type, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :uid, :string
-    #     configure :access_token, :string
-    #     configure :access_secret, :string
-    #     configure :nickname, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model Services::Twitter do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association
-    #     configure :service_users, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :type, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :uid, :string
-    #     configure :access_token, :string
-    #     configure :access_secret, :string
-    #     configure :nickname, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model ShareVisibility do
-    #   # Found associations:
-    #     configure :shareable, :polymorphic_association
-    #     configure :contact, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :shareable_id, :integer         # Hidden
-    #     configure :shareable_type, :string         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :hidden, :boolean
-    #     configure :contact_id, :integer         # Hidden   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model StatusMessage do
-    #   # Found associations:
-    #     configure :author, :belongs_to_association
-    #     configure :reshares, :has_many_association
-    #     configure :photos, :has_many_association
-    #     configure :o_embed_cache, :belongs_to_association
-    #     configure :likes, :has_many_association
-    #     configure :dislikes, :has_many_association
-    #     configure :comments, :has_many_association
-    #     configure :aspect_visibilities, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :share_visibilities, :has_many_association
-    #     configure :contacts, :has_many_association
-    #     configure :participations, :has_many_association
-    #     configure :mentions, :has_many_association
-    #     configure :resharers, :has_many_association
-    #     configure :taggings, :has_many_association         # Hidden
-    #     configure :base_tags, :has_many_association
-    #     configure :tag_taggings, :has_many_association         # Hidden
-    #     configure :tags, :has_many_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :author_id, :integer         # Hidden
-    #     configure :public, :boolean
-    #     configure :diaspora_handle, :string
-    #     configure :guid, :string
-    #     configure :pending, :boolean
-    #     configure :type, :string
-    #     configure :text, :text
-    #     configure :remote_photo_path, :text
-    #     configure :remote_photo_name, :string
-    #     configure :random_string, :string
-    #     configure :processed_image, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :unprocessed_image, :string
-    #     configure :object_url, :string
-    #     configure :image_url, :string
-    #     configure :image_height, :integer
-    #     configure :image_width, :integer
-    #     configure :provider_display_name, :string
-    #     configure :actor_url, :string
-    #     configure :objectId, :string
-    #     configure :root_guid, :string         # Hidden
-    #     configure :status_message_guid, :string         # Hidden
-    #     configure :likes_count, :integer
-    #     configure :comments_count, :integer
-    #     configure :o_embed_cache_id, :integer         # Hidden
-    #     configure :reshares_count, :integer
-    #     configure :interacted_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model TagFollowing do
-    #   # Found associations:
-    #     configure :tag, :belongs_to_association
-    #     configure :user, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :tag_id, :integer         # Hidden
-    #     configure :user_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model User do
-    #   # Found associations:
-    #     configure :invited_by, :belongs_to_association
-    #     configure :auto_follow_back_aspect, :belongs_to_association
-    #     configure :person, :has_one_association
-    #     configure :invitations_from_me, :has_many_association
-    #     configure :invitations_to_me, :has_many_association
-    #     configure :aspects, :has_many_association
-    #     configure :aspect_memberships, :has_many_association
-    #     configure :contacts, :has_many_association
-    #     configure :contact_people, :has_many_association
-    #     configure :services, :has_many_association
-    #     configure :user_preferences, :has_many_association
-    #     configure :tag_followings, :has_many_association
-    #     configure :followed_tags, :has_many_association
-    #     configure :blocks, :has_many_association
-    #     configure :ignored_people, :has_many_association
-    #     configure :notifications, :has_many_association
-    #     configure :authorizations, :has_many_association         # Hidden
-    #     configure :applications, :has_many_association         # Hidden   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :username, :string
-    #     configure :serialized_private_key, :text
-    #     configure :getting_started, :boolean
-    #     configure :disable_mail, :boolean
-    #     configure :language, :string
-    #     configure :email, :string
-    #     configure :password, :password         # Hidden
-    #     configure :password_confirmation, :password         # Hidden
-    #     configure :reset_password_token, :string         # Hidden
-    #     configure :remember_token, :string         # Hidden
-    #     configure :invitation_token, :string
-    #     configure :invitation_sent_at, :datetime
-    #     configure :remember_created_at, :datetime
-    #     configure :sign_in_count, :integer
-    #     configure :current_sign_in_at, :datetime
-    #     configure :last_sign_in_at, :datetime
-    #     configure :current_sign_in_ip, :string
-    #     configure :last_sign_in_ip, :string
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime
-    #     configure :invitation_service, :string
-    #     configure :invitation_identifier, :string
-    #     configure :invitation_limit, :integer
-    #     configure :invited_by_id, :integer         # Hidden
-    #     configure :invited_by_type, :string
-    #     configure :authentication_token, :string
-    #     configure :unconfirmed_email, :string
-    #     configure :confirm_email_token, :string
-    #     configure :locked_at, :datetime
-    #     configure :show_community_spotlight_in_stream, :boolean
-    #     configure :auto_follow_back, :boolean
-    #     configure :auto_follow_back_aspect_id, :integer         # Hidden
-    #     configure :hidden_shareables, :serialized   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-    # config.model UserPreference do
-    #   # Found associations:
-    #     configure :user, :belongs_to_association   #   # Found columns:
-    #     configure :id, :integer
-    #     configure :email_type, :string
-    #     configure :user_id, :integer         # Hidden
-    #     configure :created_at, :datetime
-    #     configure :updated_at, :datetime   #   # Sections:
-    #   list do; end
-    #   export do; end
-    #   show do; end
-    #   edit do; end
-    #   create do; end
-    #   update do; end
-    # end
-  end
-end
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index ef597c7a3..0143ef884 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -11,7 +11,9 @@ pl:
       new:
         resend_confirmation: "Wyślij ponownie instrukcję aktywacji"
       send_instructions: "W ciągu kilku minut otrzymasz wiadomość zawierającą instrukcję aktywacji konta."
+      send_paranoid_instructions: "Jeśli Twój adres email istnieje w naszej bazie w ciągu kilku minut otrzymasz wiadomość email z instrukcją potwierdzenia adresu."
     failure:
+      already_authenticated: "Już jesteś zalogowany."
       inactive: "Twoje konto nie zostało jeszcze aktywowane."
       invalid: "Nieprawidłowa nazwa użytkownika lub hasło."
       invalid_token: "Nieprawidłowy token uwierzytelnienia."
@@ -34,6 +36,8 @@ pl:
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} zaprasza Cię do diaspory*"
+      password_change:
+        subject: "Hasło zmienione"
       reset_password_instructions:
         change: "Zmiana hasła"
         ignore: "Jeśli nie chcesz zmienić hasła, zignoruj tę wiadomość."
@@ -58,12 +62,19 @@ pl:
         reset_password: "Resetuj hasło"
         send_password_instructions: "Wyślij mi instrukcję resetowania hasła"
       send_instructions: "W ciągu kilku minut otrzymasz wiadomość zawierającą instrukcję resetowania hasła."
+      send_paranoid_instructions: "Jeśli Twój email istnieje w naszej bazie w ciągu kilku minut otrzymasz email z łączem po kliknięciu którego będziesz mógł ustawić nowe hasło."
       updated: "Hasło zostało zmienione. Zalogowano pomyślnie."
+      updated_not_active: "Twoje hasło zostało pomyślnie zmienione."
     registrations:
       destroyed: "Do widzenia! Konto zostało pomyślnie zamknięte. Mamy nadzieję, że wkrótce zobaczymy Cię ponownie."
       signed_up: "Rejestracja przebiegła pomyślnie. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie e-mail potwierdzający ten fakt."
+      signed_up_but_inactive: "Rejestracja przebiegła pomyślnie. Jednakże, nie możemy Cię zalogować, ponieważ Twoje konto nie zostało jeszcze aktywowane."
+      signed_up_but_locked: "Rejestracja przebiegła pomyślnie. Jednakże, nie możemy Cię zalogować, ponieważ Twoje konto zostało zablokowane."
+      signed_up_but_unconfirmed: "Wiadomość z linkiem aktywacyjnym została wysłana na Twój adres email. Proszę kliknij łącze w celu aktywowania swojego konta."
+      update_needs_confirmation: "Twoje konto zostało zaktualizowane, ale musimy zweryfikować Twój nowy adres email. Sprawdź swoją skrzynkę i kliknij na przesłane łącze, aby potwierdzić Twój nowy adres."
       updated: "Pomyślnie zaktualizowano konto."
     sessions:
+      already_signed_out: "Wylogowano pomyślnie."
       new:
         login: "Zaloguj się"
         modern_browsers: "obsługuje wyłącznie współczesne przeglądarki."
@@ -85,6 +96,7 @@ pl:
       new:
         resend_unlock: "Wyślij ponownie instrukcję odblokowywania"
       send_instructions: "W ciągu kilku minut otrzymasz wiadomość z instrukcją odblokowania konta."
+      send_paranoid_instructions: "Jeśli Twoje konto istnieje w ciągu kilku minut otrzymasz email z instrukcją jak je odblokować."
       unlocked: "Konto zostało pomyślnie odblokowane. Pomyślnie zalogowano."
   errors:
     messages:
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index b74846d37..cbb3fb958 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -164,7 +164,7 @@ ar:
       subject: "موضوع"
       to: "إلى"
     show:
-      delete: "احْذِف واحْظُر المحادثة"
+      delete: "احْذِف  المحادثة"
       reply: "رُدَّ"
       replying: "يُجيب..."
   date:
@@ -242,7 +242,7 @@ ar:
         other: "و %{count} آخرون"
         two: "و %{count} آخران"
         zero: "و لا أحد"
-      mark_all_as_read: "وضع الجميع كمقروء"
+      mark_all_as_read: "تحديد الكل  كمقروء"
       mark_unread: "غير مقروء"
       no_notifications: "ليس هناك أيّ إخطار بعد."
       notifications: "تنبيهات"
@@ -399,12 +399,12 @@ ar:
       title: "مشاركة من %{name}"
     show:
       photos_by:
-        few: "%{count} photos by %{author}"
-        many: "%{count} photos by %{author}"
-        one: "One photo by %{author}"
-        other: "%{count} photos by %{author}"
-        two: "Two photos by %{author}"
-        zero: "No photos by %{author}"
+        few: "%{count} صور بواسطة %{author}"
+        many: "%{count} صور بواسطة %{author}"
+        one: "صورة بواسطة %{author}"
+        other: "%{count} صور بواسطة %{author}"
+        two: "صورتين بواسطة %{author}"
+        zero: "صورة واحدة بواسطة %{author}"
       reshare_by: "أعيد مشاركتها بواسطة %{author}"
   privacy: "الخصوصيّة"
   profile: "الملفّ الشخصيّ"
@@ -429,11 +429,11 @@ ar:
   registrations:
     closed: "التسجيلات مغلقة على هذه المنصة"
     create:
-      success: "سجل في دياسبرا"
+      success: "لقد انضممت الى دياسبرا "
     new:
       email: "الإيميـــل"
       enter_email: "أدخل عنوان بريد إلكتروني"
-      enter_password: "أدخل كلمة مرور"
+      enter_password: "أدخل كلمة مرور (على الاقل ستة حروف)"
       enter_password_again: "أعد إدخال كلمة المرور"
       enter_username: "اختر معرف (فقط حروف, أرقام, و الإشارات الخطية)"
       password: "كلمة السر"
@@ -488,12 +488,11 @@ ar:
       discard_post: "تجاهل المشاركة"
       new_user_prefill:
         hello: "مرحبًا جميعًا، أنا #%{new_user_tag}. "
-        i_like: "I'm interested in %{tags}."
+        i_like: "انا مهتم بـ %{tags}."
         invited_by: "شكراً على الدعوة، "
         newhere: "جديد هنا"
       posting: "يَنشُر ..."
       share: "شَارِك"
-      upload_photos: "حمل الصور"
       whats_on_your_mind: "ماذا يجول في خاطرك؟"
     stream_element:
       via: "بواسطة %{link}"
@@ -506,12 +505,14 @@ ar:
   status_messages:
     new:
       mentioning: "ذكر %{person}"
-    too_long: "{\"few\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"many\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"one\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"other\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"two\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"zero\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\"}"
+    too_long: |-
+        يجب ان تكون رسالتك أقل من %{count} حرف
+        تم استخدام %{current_length}حتى الآن
   streams:
     activity:
       title: "نشاطى"
     aspects:
-      title: "Your Aspects"
+      title: "فئاتي"
     aspects_stream: "الفئات"
     comment_stream:
       title: "المشاركات التى تم التعليق عليها"
@@ -551,6 +552,7 @@ ar:
       close_account:
         dont_go: "عزيزى , من فضلك لا تذهب"
         mr_wiggles: "الاستاذ . ويجليس سيكون حزين لانه يراك تذهب"
+        what_we_delete: "سنحذف جميع مشاركاتك وبيانات ملفك الشخصي في أقرب وقت ممكن. ستظل تعليقاتك على مشاركات الأشخاص الآخرين تظهر، ولكن سيتم ربطها مع حسابك  بدلا من اسمك "
       close_account_text: "أغلق الحساب"
       comment_on_post: "...علق أحدهم على مشاركتك"
       current_password: "كلمة المرور الحالية"
@@ -572,11 +574,12 @@ ar:
       started_sharing: "...بدأ أحدهم المشاركة معك؟"
       stream_preferences: "تفضيلات ساحة المشاركة"
       your_email: "بريدك الإلكتروني"
-      your_handle: "وسيط ديسبورا الخاص بك"
+      your_handle: "حساب ديسبورا الخاص بك"
     getting_started:
-      awesome_take_me_to_diaspora: "مدهش! خذنى إلى دياسبرا*"
+      awesome_take_me_to_diaspora: "مدهش! انقلني إلى دياسبرا*"
       hashtag_explanation: "الوسوم تسمح لك بالحديث عن اهتماماتك ومتابعتها.  وهي أيضا طريقة عبقرية للعثور على أناس جدد بدياسبرا."
       hashtag_suggestions: "جرب الوسوم التالية احب #فن، #أفلام، #صور، إلخ."
+      well_hello_there: "حسنا مرحبا جميعا"
       who_are_you: "من أنت؟"
     privacy_settings:
       ignored_users: "المستخدمين الذين تم تجاهلهم"
@@ -587,6 +590,7 @@ ar:
     update:
       email_notifications_changed: "فشل تغيير اللغة"
       follow_settings_changed: "تم تغيير إعدادات المتابعة"
+      follow_settings_not_changed: "لم يتم تعديل إعدادات المتابعة"
       language_changed: "غُيِّرت اللغة بنجاح"
       language_not_changed: "فشل تغيير اللغة"
       password_changed: "غُيِّرت كلمة المرور بنجاح. يمكنك الولوج بكلمة سرك الجديدة."
diff --git a/config/locales/diaspora/art-nvi.yml b/config/locales/diaspora/art-nvi.yml
index ada1adab7..73b06abe0 100644
--- a/config/locales/diaspora/art-nvi.yml
+++ b/config/locales/diaspora/art-nvi.yml
@@ -115,8 +115,6 @@ art-nvi:
     invitations:
       by_email: "ìlä email"
       invite_your_friends: "pawm ngeyä eylanti fìtseng"
-    publisher:
-      upload_photos: "Fpe' relit"
     stream_element:
       via: "ìlä %{link}"
   streams:
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index ebe828520..cb7fd1ec0 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -383,7 +383,6 @@ bg:
         newhere: "НовТук"
       posting: "Публикуване..."
       share: "Споделете"
-      upload_photos: "Качете снимки"
       whats_on_your_mind: "За какво мислите?"
     stream_element:
       via: "чрез %{link}"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 6f2c9aa2a..c5efa942a 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -596,7 +596,6 @@ br:
       posting: "Oc'h embann..."
       remove_location: "Lemel kuit al lec'hiadur"
       share: "Kenrannañ"
-      upload_photos: "Pellgargañ skeudennoù"
       whats_on_your_mind: "E petra emaoc'h o soñjal ?"
     stream_element:
       via: "dre %{link}"
diff --git a/config/locales/diaspora/bs.yml b/config/locales/diaspora/bs.yml
index 0cabfae9e..14b85e4a9 100644
--- a/config/locales/diaspora/bs.yml
+++ b/config/locales/diaspora/bs.yml
@@ -578,7 +578,6 @@ bs:
         newhere: "NoviOvdje"
       posting: "Objavljujem..."
       share: "Dijeli"
-      upload_photos: "Objavi fotografije"
       whats_on_your_mind: "Šta vam je na umu?"
     stream_element:
       via: "putem %{link}"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 20833537e..863f295a1 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -993,7 +993,6 @@ cs:
       posting: "Odesílám…"
       remove_location: "Odstranit pozici"
       share: "Sdílet"
-      upload_photos: "Nahrát fotky"
       whats_on_your_mind: "Co máte na mysli?"
     stream_element:
       via: "skrz %{link}"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 66dd8dbde..57e892f20 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -1067,7 +1067,6 @@ da:
       posting: "Sender ..."
       remove_location: "Fjern placering"
       share: "Del"
-      upload_photos: "Upload fotos"
       whats_on_your_mind: "Hvad har du på hjertet?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/de-CH.yml b/config/locales/diaspora/de-CH.yml
index 25091441b..8f0629975 100644
--- a/config/locales/diaspora/de-CH.yml
+++ b/config/locales/diaspora/de-CH.yml
@@ -52,7 +52,7 @@ de-CH:
     admin_bar:
       pages: "Siitä"
       pod_stats: "Pod Statistik"
-      report: "Uswertige"
+      report: "Meldige"
       sidekiq_monitor: "Sidekiq-Monitor"
       user_search: "Benutzer Suechi"
       weekly_user_stats: "Wöchentlichi Benutzerstatistik"
@@ -234,6 +234,7 @@ de-CH:
   error_messages:
     helper:
       correct_the_following_errors_and_try_again: "Korrigier folgendi Fähler und versuechs nomel."
+    need_javascript: "Die Website brucht JavaScript damit si suuber funktioniert. Wenn du JavaScript deaktiviert hesch, bitte aktivier's und lad d'Siite neu."
   fill_me_out: "Füll mi uus"
   find_people: "Find Mensche oder #Tags"
   help:
@@ -366,6 +367,7 @@ de-CH:
     mentioned_deleted:
       one: "%{actors} het dich imene glöschte Biitrag erwähnt."
       other: "%{actors} hend dich imene glöschte Biitrag erwähnt."
+    post: "Biitrag"
     private_message:
       one: "%{actors} het dir e Nochricht gschickt."
       other: "%{actors} hend dir e Nochricht gschickt."
@@ -381,7 +383,7 @@ de-CH:
       other: "%{actors} hend agfange mit dir z'teile."
       zero: "Niemer het agfange mit dir z'teile."
   notifier:
-    a_limited_post_comment: "Es git en neue Kommentar zumene limitierte Biitrag uf diaspora*"
+    a_limited_post_comment: "Es git en neue Kommentar zumene begrenzte Biitrag uf diaspora*"
     a_post_you_shared: "en Biitrag."
     a_private_message: "Es git e neue pivati Nochricht für dich uf diaspora*"
     click_here: "druck do"
@@ -498,7 +500,7 @@ de-CH:
       gender: "Gschlächt"
       location: "Ort"
     show:
-      closed_account: "Dä Konto isch gschlosse worde."
+      closed_account: "Da Konto isch gschlosse worde."
       does_not_exist: "Die Person existiert nöd!"
       has_not_shared_with_you_yet: "%{name} het bis etz no kei Biiträg mit dir teilt!"
   photos:
@@ -601,8 +603,8 @@ de-CH:
       mobile_row_checked: "%{name} (entferne)"
       mobile_row_unchecked: "%{name} (hinzuefüege)"
       toggle:
-        one: "I %{count} aspekt"
-        other: "I %{count} aspekt"
+        one: "I %{count} Aspekt"
+        other: "I %{count} Aspekt"
     invitations:
       by_email: "Lad Lüüt per email ii"
       invite_your_friends: "Lad dini Kollege ii"
@@ -632,7 +634,6 @@ de-CH:
       posting: "Abschicke..."
       remove_location: "Standort entferne"
       share: "Teilä"
-      upload_photos: "Fotis Uelade"
       whats_on_your_mind: "Was lauft?"
     stream_element:
       via: "via %{link}"
@@ -678,8 +679,8 @@ de-CH:
     followed_tag:
       add_a_tag: "En Tag hinzuefüege"
       follow: "Folge"
-      title: "#tags wo du folgsch"
-    followed_tags_stream: "#tags wo du folgsch"
+      title: "#tags dene du folgsch"
+    followed_tags_stream: "#tags dene du folgsch"
     like_stream:
       title: "\"gfallt mer\"-Stream"
     mentioned_stream: "@Erwähnige"
diff --git a/config/locales/diaspora/de-moo.yml b/config/locales/diaspora/de-moo.yml
index ea57c97a4..d9956ae65 100644
--- a/config/locales/diaspora/de-moo.yml
+++ b/config/locales/diaspora/de-moo.yml
@@ -512,7 +512,6 @@ de-moo:
         newhere: "NeuHier"
       posting: "Senden …"
       share: "Teilen"
-      upload_photos: "Fotos hochladen"
       whats_on_your_mind: "Woran denkst du gerade?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index abfe5d2d7..e0acb6df2 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -1014,7 +1014,7 @@ de:
     destroy:
       success: "Authentifizierung erfolgreich gelöscht."
     failure:
-      error: "Es gab einen Fehler beim Verbinden mit dem Dienst."
+      error: "Es gab einen Fehler beim Verbinden mit diesem Dienst."
     index:
       connect: "Verbinde"
       disconnect: "Verbindung entfernen"
@@ -1069,7 +1069,6 @@ de:
       posting: "Senden …"
       remove_location: "Ort entfernen"
       share: "Teilen"
-      upload_photos: "Fotos hochladen"
       whats_on_your_mind: "Woran denkst du gerade?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index e76c08875..9ca6f1c1e 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -1062,7 +1062,6 @@ de_formal:
       posting: "Senden …"
       remove_location: "Position entfernen"
       share: "Teilen"
-      upload_photos: "Fotos hochladen"
       whats_on_your_mind: "Woran denken Sie gerade?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 364f4d0c8..cce763ee1 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -552,7 +552,6 @@ el:
         newhere: "ΝέοςΕδώ"
       posting: "Ανάρτηση..."
       share: "Κοινοποίηση"
-      upload_photos: "Μεταφόρτωση εικόνων"
       whats_on_your_mind: "Τι σκέφτεσαι;"
     stream_element:
       via: "Μέσω %{link}"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 3aeb5d5b8..3116e0c19 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1057,7 +1057,6 @@ en:
       formatWithMarkdown: "You can use %{markdown_link} to format your post"
       posting: "Posting..."
       share: "Share"
-      upload_photos: "Upload photos"
       get_location: "Get your location"
       remove_location: "Remove location"
       whats_on_your_mind: "What’s on your mind?"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index af92ada77..0d361dcf4 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -517,7 +517,6 @@ en_1337:
         newhere: "#n00b_h3r3"
       posting: "5P4MM1NG..."
       share: "5P4M"
-      upload_photos: "UPL04D P1C5"
       whats_on_your_mind: "WH475 0N Y0UR M1ND?"
     stream_element:
       via: "V14 %{link}"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 00973b97b..e122b0598 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -490,7 +490,6 @@ en_pirate:
       posting: "Firin!"
       remove_location: "Eye patch ye location!"
       share: "Fire!"
-      upload_photos: "Hang up portraits"
       whats_on_your_mind: "What be botherin' you?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 64f541c76..a5441825c 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -361,7 +361,6 @@ en_shaw:
         i_like: "I'm interested in %{tags}."
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
       share: "𐑖𐑺"
-      upload_photos: "𐑳𐑐𐑤𐑴𐑛 𐑓𐑴𐑑𐑴𐑟"
       whats_on_your_mind: "𐑢𐑳𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?"
     stream_element:
       via: "𐑝𐑾 %{link}"
diff --git a/config/locales/diaspora/en_valspeak.yml b/config/locales/diaspora/en_valspeak.yml
index a96daf03a..04651f1b7 100644
--- a/config/locales/diaspora/en_valspeak.yml
+++ b/config/locales/diaspora/en_valspeak.yml
@@ -899,7 +899,6 @@ en_valspeak:
       posting: "Postin..."
       remove_location: "Trash where u r"
       share: "Share!!!"
-      upload_photos: "Upload picz!!"
       whats_on_your_mind: "Sup dude?"
     stream_element:
       via: "like... via %{link}"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 0dc842994..8cec5a7d3 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -520,7 +520,6 @@ eo:
         newhere: "NewHere"
       posting: "Afiŝanta..."
       share: "Konigi"
-      upload_photos: "Alŝuti bildojn"
       whats_on_your_mind: "Kion vi nun pensas?"
     stream_element:
       via: "per %{link}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index acbdb8775..6c62ac632 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -1065,7 +1065,6 @@ es-AR:
       posting: "Publicando..."
       remove_location: "Eliminar ubicación"
       share: "Compartir"
-      upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Qué tenés en mente?"
     stream_element:
       via: "A través de %{link}"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 6c72c73f3..39aad1c4c 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -658,7 +658,6 @@ es-CL:
         newhere: "Hola"
       posting: "Posteando..."
       share: "Compartir"
-      upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Que pasa por tu cabeza?"
     stream_element:
       via: "vía %{link}"
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index 05125de4d..c27d2a0ab 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -659,7 +659,6 @@ es-MX:
         newhere: "Hola"
       posting: "Publicando…"
       share: "Comparte"
-      upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Qué tienes en mente?"
     stream_element:
       via: "vía %{link}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index bec9f279f..b54fc25c9 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -1004,7 +1004,6 @@ es:
       posting: "Publicando..."
       remove_location: "Eliminar ubicación"
       share: "Compartir"
-      upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Qué estás pensando?"
     stream_element:
       via: "Vía %{link}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 93050b4fa..ce6191435 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -501,7 +501,6 @@ eu:
         newhere: "Berria"
       posting: "Partekatzen..."
       share: "Partekatu"
-      upload_photos: "Argazkiak igo"
       whats_on_your_mind: "Zer ari zara pentsatzen?"
     stream_element:
       via: "%{link}(r)en bidez"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 30977be67..00e7b4bc2 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -887,7 +887,6 @@ fi:
       posting: "Lähetetään..."
       remove_location: "Poista sijainti"
       share: "Jaa"
-      upload_photos: "Lisää kuvia"
       whats_on_your_mind: "Mitä mielessä?"
     stream_element:
       via: "%{link} kautta"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index d67bcb21a..ba60ed525 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -1050,7 +1050,6 @@ fr:
       posting: "Publication…"
       remove_location: "Supprimer l'emplacement"
       share: "Partager"
-      upload_photos: "Envoyer des photos"
       whats_on_your_mind: "Exprimez-vous..."
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index e51918d29..03b55cb80 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -545,7 +545,6 @@ he:
       posting: "בפרסום..."
       remove_location: "הסרת מיקום"
       share: "שיתוף"
-      upload_photos: "העלאת תמונות"
       whats_on_your_mind: "על מה אתם חושבים?"
     stream_element:
       via: "באמצעות %{link}"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index b5b988588..a35696a0a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -800,7 +800,6 @@ hu:
       posting: "Küldés..."
       remove_location: "Tartózkodási hely eltávolítása"
       share: "Megosztás"
-      upload_photos: "Képek feltöltése"
       whats_on_your_mind: "Mi jár a fejedben?"
     stream_element:
       via: "ezen keresztül: %{link}"
diff --git a/config/locales/diaspora/hy.yml b/config/locales/diaspora/hy.yml
index 0c47f9dd2..d5cbdd905 100644
--- a/config/locales/diaspora/hy.yml
+++ b/config/locales/diaspora/hy.yml
@@ -1001,7 +1001,6 @@ hy:
       posting: "Գրառվում է..."
       remove_location: "Ջնջել տեղակայությունը"
       share: "Կիսվել"
-      upload_photos: "Նկարներ վերբեռնել"
       whats_on_your_mind: "Ի՞նչ կա մտքիդ։"
     stream_element:
       via: "Էստեղից` %{link}"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 2e1e57e6c..620723760 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -999,7 +999,6 @@ ia:
       posting: "Invio in curso…"
       remove_location: "Remover loco"
       share: "Divider"
-      upload_photos: "Incargar photos"
       whats_on_your_mind: "De que pensa tu?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index bf707add0..f3bf7f789 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -451,7 +451,6 @@ is:
         newhere: "nýr hér"
       posting: "Senda..."
       share: "Deila"
-      upload_photos: "Senda inn myndir"
       whats_on_your_mind: "Hvað er þér efst í huga?"
     stream_element:
       via: "með %{link}"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 1976e1174..60ba3b39f 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -710,7 +710,6 @@ it:
       posting: "Invio in corso..."
       remove_location: "Rimuovi posizione"
       share: "Condividi"
-      upload_photos: "Carica foto"
       whats_on_your_mind: "A cosa stai pensando?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 21a95309b..bc2ecd0b1 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -1025,7 +1025,6 @@ ja:
       posting: "投稿中"
       remove_location: "所在地を削除"
       share: "シェア"
-      upload_photos: "写真をアップロード"
       whats_on_your_mind: "いま何を考えている？"
     stream_element:
       via: "%{link} で"
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index bbaa2c4af..4d7c9af21 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -422,7 +422,6 @@ ka:
         newhere: "ახალი"
       posting: "დაპოსტვა"
       share: "გაზიარება"
-      upload_photos: "ფოტოების ატვირთვა"
       whats_on_your_mind: "რას ფიქრობ ?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 88b64717e..aa3c581d9 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -528,7 +528,6 @@ ko:
       posting: "올리는 중···"
       remove_location: "위치 삭제"
       share: "공유"
-      upload_photos: "사진 올리기"
       whats_on_your_mind: "무슨 생각해요?"
     stream_element:
       via: "%{link}에서"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index a66e9dcc3..7543a0497 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -630,7 +630,6 @@ ml:
         newhere: "NewHere"
       posting: "കുറിക്കുന്നു..."
       share: "പങ്കുവെയ്ക്കുക"
-      upload_photos: "Upload photos"
       whats_on_your_mind: "എന്താണ് നിങ്ങളുടെ മനസ്സില്‍?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 9b4b8bc10..5db719085 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -906,7 +906,6 @@ nb:
       posting: "Publiserer ..."
       remove_location: "Fjern lokasjon"
       share: "Del"
-      upload_photos: "Last opp bilder"
       whats_on_your_mind: "Hva tenker du på?"
     stream_element:
       via: "via %{link}"
diff --git a/config/locales/diaspora/nds.yml b/config/locales/diaspora/nds.yml
index bd3a0c38b..a5d519e28 100644
--- a/config/locales/diaspora/nds.yml
+++ b/config/locales/diaspora/nds.yml
@@ -695,7 +695,6 @@ nds:
         newhere: "neehier"
       posting: "Schriev..."
       share: "Deelen"
-      upload_photos: "Biller hoochloden"
       whats_on_your_mind: "Wat geiht di dörch den Kopp?"
     stream_element:
       via: "Öber %{link}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index fc9871d75..e04f9927d 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -1044,7 +1044,6 @@ nl:
       posting: "Plaatsen..."
       remove_location: "Verwijder locatie"
       share: "Delen"
-      upload_photos: "Upload fotos"
       whats_on_your_mind: "Waar denk je aan?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 469e6ab79..0472d71fa 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -93,7 +93,8 @@ nn:
   are_you_sure_delete_account: "Er du heilt sikker på at du vil stenge kontoen din? Dette kan ikkje gjerast om!"
   aspect_memberships:
     destroy:
-      failure: "Klarte ikkje å fjerna personen frå aspektet"
+      failure: "Fekk ikkje fjerna personen frå aspektet"
+      forbidden: "Du har ikkje lov til å gjere det."
       no_membership: "Fann ikkje den valde personen i det aspektet"
       success: "Fjerna personen frå aspektet"
   aspects:
@@ -118,6 +119,7 @@ nn:
       updating: "oppdaterer"
     index:
       donate: "Doner"
+      donate_liberapay: "Doner med Liberapay"
       help:
         any_problem: "Har du eit problem?"
         contact_podmin: "Ta kontakt med administratoren (podminen) på poden din."
@@ -169,6 +171,8 @@ nn:
     post_something: "denne lenkja"
   cancel: "Avbryt"
   comments:
+    create:
+      error: "Fekk ikkje kommentert."
     new_comment:
       comment: "Kommenter"
       commenting: "Kommenterer …"
@@ -215,6 +219,10 @@ nn:
   fill_me_out: "Fyll meg ut"
   find_people: "Finn personar eller #grindmerke"
   help:
+    account_and_data_management:
+      close_account_q: "Korleis slettar eg kontoen min?"
+      data_visible_to_podmin_q: "Kor mykje av informasjonen min kan pod-administratoren min sjå?"
+      move_pods_q: "Korleis flyttar eg kontoen min frå ein pod til ein annan?"
     getting_help:
       getting_started_q: "Hjelp! Eg treng nokon til å hjelpe meg i gang!"
       title: "Få hjelp"
@@ -226,8 +234,11 @@ nn:
     tutorial: "innføring"
     tutorials: "innføringar"
     wiki: "wiki"
+  invitation_codes:
+    already_logged_in: "Du er blitt invitert til å registrere deg på denne poden av %{inviter}, men du er allereie logga inn."
   invitations:
     create:
+      closed: "Det er ikkje mogleg å invitere nokon til denne Diaspora*-poden."
       empty: "Skriv inn minst ei e-post-adresse."
       no_more: "Du har ingen fleire invitasjonar."
       note_already_sent: "Invitasjonar er allereie sende til: %{emails}"
@@ -257,6 +268,11 @@ nn:
       logout: "Logg ut"
       profile: "Profil"
       settings: "Innstillingar"
+  likes:
+    create:
+      error: "Fekk ikkje likt."
+    destroy:
+      error: "Likar framleis."
   limited: "Avgrensa"
   more: "Meir"
   no_results: "Fann ingen resultat"
@@ -464,6 +480,8 @@ nn:
       username: "BRUKARNAMN"
   reshares:
     comment_email_subject: "%{resharer} si deling av %{author} sitt innlegg"
+    create:
+      error: "Fekk ikkje delt."
     reshare:
       deleted: "Forfattaren har sletta originalinnlegget."
       reshare_confirmation: "Vil du dele %{author} sitt innlegg?"
@@ -518,7 +536,6 @@ nn:
         newhere: "NyHer"
       posting: "Sender …"
       share: "Del"
-      upload_photos: "Last opp bilete"
       whats_on_your_mind: "Kva tenkjer du på?"
     stream_element:
       via: "via %{link}"
@@ -531,6 +548,7 @@ nn:
     activity:
       title: "Min aktivitet"
     aspects:
+      all: "Alle aspekta"
       title: "Aspekta mine"
     aspects_stream: "Aspektar"
     comment_stream:
diff --git a/config/locales/diaspora/oc.yml b/config/locales/diaspora/oc.yml
index e34ae2c85..726baf212 100644
--- a/config/locales/diaspora/oc.yml
+++ b/config/locales/diaspora/oc.yml
@@ -717,6 +717,26 @@ oc:
       click_link: "Per activar vòstre novèla adreça de corrièl %{unconfirmed_email}, seguissètz aqueste ligam :"
       subject: "Mercés d'activar vòstre novèl corrièl %{unconfirmed_email}"
     csrf_token_fail:
+      body: |-
+          Adissiatz %{name}, 
+
+          diaspora* a detectat un ensag d’accès a vòstre sesilha que poiriá èsser pas autorizat. Per evitar que vòstras donadas siasguen gastadas sètz estat desconnectat. Vos copetz pas lo cap, vos podètz tornar connectar en seguretat ara. 
+           
+          Una demanda es estada facha n’emplegant un geton CSRF incorrècte o absent. Aquò poiriá èsser completament innocent, mai aquò pòt tanben èsser un atac apelat Cross-site request forgery (CSRF). 
+           
+          Aquò pòt venir de : 
+           
+            - una extension que manipula la demanda o que fa de demanda sens lo geton;
+            - un onglet daissat dubèrt d’una anciana sesilha;
+            - un fum d’aisinas extèrnas;
+            - un marrit còdi qu’ensaja d'accedir a vòstras donadas. 
+           
+          Per mai informacion subre l’atac CSRF vejatz [%{link}](%{link}). 
+           
+          Se tenètz vist aqueste messatge, mercés de verificar los punts al dessús, inclús las extensions de qual que siague navigador. 
+           
+          Mercés, 
+          Lo robòt de corrièl a diaspora* !
       subject: "Avèm recebut una demanda sens autorizacion de vòstre compte, %{name}"
     email_sent_by_diaspora: "Aqueste corrièl es estat mandat per %{pod_name}. Se volètz pas mai de corrièls atal,"
     export_email:
@@ -1032,8 +1052,7 @@ oc:
       posting: "Publicacion..."
       remove_location: "Suprimir l'emplaçament"
       share: "Partejar"
-      upload_photos: "Mandar de fòtos"
-      whats_on_your_mind: "A qué pensatz ?"
+      whats_on_your_mind: "A de qué pensatz ?"
     stream_element:
       via: "Via %{link}"
       via_mobile: "Enviat d'un mobil"
@@ -1176,7 +1195,7 @@ oc:
       connect_to_facebook: "Podèm accelerar un pauc las causas de %{link} sus diaspora*. Aquò botarà vòstre nom e foto, e activar la publicacion multiplataforma."
       connect_to_facebook_link: "Connexion amb vòtre compte Facebook en cors"
       hashtag_explanation: "Las etiquetas vos permeton de charrar e seguir vòstres interèsses.  Son tanben una bona manièra de trobar de mond novèl sus diaspora*."
-      hashtag_suggestions: "Ensejatz etiquetas coma aquestas #art #filmes #gif, etc."
+      hashtag_suggestions: "Ensajatz etiquetas coma aquestas #art #filmes #gif, etc."
       well_hello_there: "E ben, adiu monde !"
       what_are_you_in_to: "Qué vos interèssa ?"
       who_are_you: "Qual sètz ?"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index a84e03820..31ab69a49 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -154,19 +154,30 @@ pl:
           approve: "Zatwierdź"
           deny: "Odmów"
           no_requirement: "%{name} nie wymaga żadnego pozwolenia"
+      error_page:
+        contact_developer: "Powinieneś skontaktować się z twórcą aplikacji i wysłać mu następującą, szczegółową informację o błędzie:"
+        could_not_authorize: "Autoryzacja aplikacji się nie powiodła"
+        login_required: "By autoryzować tę aplikację musisz się najpierw zalogować"
+        title: "O nie! Coś poszło nie tak :("
       scopes:
         openid:
           description: "Pozwala aplikacji na czytanie profilu podstawowego"
           name: "Profil podstawowy"
+        profile:
+          description: "Pozwala aplikacji na czytanie profilu poszerzonego"
+          name: "rozszerzony profil"
         read:
+          description: "Pozwala aplikacji czytać Twój strumień, rozmowy oraz cały profil."
           name: "Czytaj profil, strumień i rozmowy"
+        write:
+          description: "Pozwala aplikacji dodawać nowe wpisy i reakcje oraz uczestniczyć w rozmowach."
       user_applications:
         index:
           access: "%{name} ma dostęp do:"
           edit_applications: "Aplikacje"
           no_requirement: "%{name} nie wymaga pozwolenia"
           title: "Autoryzowane aplikacje"
-        no_applications: "Nie masz pozwolonych aplikacji"
+        no_applications: "Nie autoryzowałeś/łaś żadnych aplikacji"
         policy: "Sprawdź warunki prywatności aplikacji"
         revoke_autorization: "Odwołuj"
         tos: "Sprawdź warunki obsługi aplikacji"
@@ -176,6 +187,7 @@ pl:
     destroy:
       failure: "Nie udało się usunąć osoby z aspektu"
       forbidden: "Nie masz pozwolenia by to zrobić."
+      invalid_statement: "Odrzucono zduplikowany rekord."
       no_membership: "Nie udało się odnaleźć wskazanej osoby w tym aspekcie"
       success: "Pomyślnie usunięto osobę z aspektu"
   aspects:
@@ -201,6 +213,7 @@ pl:
       updating: "Aktualizowanie"
     index:
       donate: "Wspomóż"
+      donate_liberapay: "Wesprzyj poprzez liberapay"
       help:
         any_problem: "Jakiś problem?"
         contact_podmin: "Skontaktuj się z administratorem swojego poda!"
@@ -253,6 +266,8 @@ pl:
     post_something: "Opublikuj w Diasporze"
   cancel: "Anuluj"
   comments:
+    create:
+      error: "Nie udało się dodać komentarza."
     new_comment:
       comment: "Skomentuj"
       commenting: "Dodawanie komentarza..."
@@ -272,6 +287,7 @@ pl:
       user_search: "Wyszukiwanie użytkowników"
     spotlight:
       community_spotlight: "W centrum uwagi społeczności"
+      no_members: "Nie ma jeszcze żadnych członków."
       suggest_member: "Zasugeruj członka"
   conversations:
     create:
@@ -284,6 +300,7 @@ pl:
       conversations_inbox: "Rozmowy - Skrzynka Odbiorcza"
       inbox: "Skrzynka odbiorcza"
       new_conversation: "Nowa rozmowa"
+      no_contacts: "Przed rozpoczęciem rozmowy musisz dodać kilka kontaktów"
       no_messages: "Brak wiadomości"
     new:
       message: "Wiadomość"
@@ -308,8 +325,10 @@ pl:
   delete: "Usuń"
   email: "E-mail"
   error_messages:
+    csrf_token_fail: "Token CSRF jest niepoprawny. Zaloguj się i spróbuj ponownie."
     helper:
       correct_the_following_errors_and_try_again: "Popraw poniższe błędy i spróbuj ponownie."
+    need_javascript: "Strona do poprawnego działania wymaga obsługi JavaScriptu. Jeśli ją wyłączyłeś, proszę byś ją włączył i odświeżył stronę."
   fill_me_out: "Wypełnij mnie"
   find_people: "Znajdź osoby lub #znaczniki"
   help:
@@ -529,8 +548,26 @@ pl:
     tutorial: "samouczek"
     tutorials: "samouczki"
     wiki: "wiki"
+  home:
+    default:
+      be_who_you_want_to_be: "Bądź kimkolwiek chcesz być"
+      byline: "Wirtualna sieć społecznościowa nad którą to Ty masz kontrolę"
+      choose_your_audience: "Wybierz swoich słuchaczy"
+      headline: "Witaj na %{pod_name}"
+      own_your_data: "Twoje dane należą do Ciebie"
+    podmin:
+      configure_your_pod: "Skonfiguruj swój pod"
+      contact_irc: "porozmawiaj z nami na IRC-u"
+      contribute: "Współtwórz"
+      create_an_account: "Stwórz konto"
+      headline: "Witaj, przyjacielu."
+      update_your_pod: "Zaktualizuj swój pod"
+  invitation_codes:
+    already_logged_in: "%{inviter} zaprosił Cię na ten pod, ale jesteś już zalogowany."
+    not_valid: "Kod zaproszenia wygasł"
   invitations:
     create:
+      closed: "Wysyłanie zaproszeń jest obecnie wyłączone na tym podzie diaspory*."
       empty: "Podaj przynajmniej jeden adres e-mail."
       no_more: "Nie masz więcej zaproszeń."
       note_already_sent: "Zaproszenia zostały już wysłane do: %{emails}"
@@ -564,6 +601,11 @@ pl:
       profile: "Profil"
       settings: "Ustawienia"
       toggle_navigation: "Przełącz nawigację"
+  likes:
+    create:
+      error: "Nie udało się polubić."
+    destroy:
+      error: "Nie udało się usunąć polubienia."
   limited: "Ograniczone"
   more: "Więcej"
   no_results: "Niczego nie znaleziono"
@@ -744,6 +786,7 @@ pl:
       subject: "%{name} wspomniał o Tobie na diasporze*"
     private_message:
       reply_to_or_view: "Odpowiedz lub wyświetl wątek >"
+      subject: "Masz nową prywatną wiadomość"
     remove_old_user:
       body: |-
           Witaj,
@@ -829,6 +872,7 @@ pl:
       title: "Wpis od %{name}"
     show:
       forbidden: "Nie masz pozwolenia by to zrobić."
+      location: "Wysłano z: %{location}"
       photos_by:
         few: "%{count} zdjęcia od %{author}"
         many: "%{count} zdjęć od %{author}"
@@ -841,11 +885,19 @@ pl:
   profiles:
     edit:
       allow_search: "Pozwól innym użytkownikom diaspory* na wyszukanie ciebie"
+      basic: "Mój podstawowy profil"
+      basic_hint: "Wszystkie elementy Twojego profilu są opcjonalne. Twój podstawowy profil zawsze będzie publicznie dostępny."
+      extended: "Mój rozszerzony profil"
+      extended_hint: "Użyj przełącznika by ustawić widoczność Twojego rozszerzonego profilu. Publiczna oznacza, że będzie widoczny dla każdego z internecie, ograniczona, że tylko dla osób z którymi dzielisz się na Diasporze."
+      extended_visibility_text: "Widoczność Twojego rozszerzonego profilu:"
       first_name: "Imię"
       last_name: "Nazwisko"
+      limited: "Ograniczona"
       nsfw_check: "Oznacz wszystko co udostępniam jako NSFW"
       nsfw_explanation: "NSFW (‘nieodpowiedni w pracy’, ang. 'not safe for work') jest standardem ustalanym przez samorządną społeczność diaspory* określającym zawartość, która może nie być odpowiednia do przeglądania w czasie pracy. Jeśli planujesz często udostępniać taką zawartość, prosimy zaznacz to pole - sprawi to, że te wpisy będą zasłonięte w strumieniu dopóki użytkownik nie zdecyduje się ich zobaczyć."
       nsfw_explanation2: "Jeśli zdecydujesz się nie zaznaczać tej opcji, prosimy dodawaj tag #nsfw za każdym razem kiedy udostępniasz taką zawartość."
+      public: "Publiczna"
+      settings: "Ustawienia profilu"
       update_profile: "Aktualizuj profil"
       your_bio: "O Tobie"
       your_birthday: "Twoje urodziny"
@@ -885,6 +937,7 @@ pl:
     post_label: "<b>Wpis</b>: %{title}"
     reason_label: "Powód:"
     reported_label: "<b>Zgłoszony przez</b> %{person}"
+    reported_user_details: "Szczegółowe informacje odnośnie zgłoszonego użytkownika"
     review_link: "Oznacz jako sprawdzony"
     status:
       destroyed: "Wpis został zniszczony"
@@ -892,6 +945,8 @@ pl:
     title: "Przegląd zgłoszeń"
   reshares:
     comment_email_subject: "%{resharer} przekazał/a dalej wpis %{author}"
+    create:
+      error: "Nie udało się przekazać dalej."
     reshare:
       deleted: "Oryginał został usunięty przez autora."
       reshare_confirmation: "Przekazać dalej wpis użytkownika %{author}?"
@@ -916,6 +971,7 @@ pl:
       not_logged_in: "Nie zalogowany."
       really_disconnect: "Odłączyć %{service}?"
       services_explanation: "Podłączenie usług umożliwia jednoczesne publikowanie w nich wpisów, które udostępniasz w sieci Diaspora*."
+      title: "Zarządzaj podłączonymi usługami"
     provider:
       facebook: "Facebook"
       tumblr: "Tumblr"
@@ -950,7 +1006,7 @@ pl:
     publisher:
       discard_post: "Porzuć wpis"
       formatWithMarkdown: "Możesz użyć %{markdown_link} aby sformatować swój wpis"
-      get_location: "Ustal twoją lokalizację"
+      get_location: "Ustal Twoją lokalizację"
       new_user_prefill:
         hello: "Witajcie wszyscy, jestem #%{new_user_tag}. "
         i_like: "Interesują mnie %{tags}."
@@ -961,7 +1017,6 @@ pl:
       posting: "Publikowanie..."
       remove_location: "Usuń lokalizację"
       share: "Udostępnij"
-      upload_photos: "Prześlij zdjęcia"
       whats_on_your_mind: "O czym myślisz?"
     stream_element:
       via: "Przez %{link}"
@@ -999,25 +1054,31 @@ pl:
     activity:
       title: "Moja aktywność"
     aspects:
+      all: "Wszystkie aspekty"
       title: "Moje aspekty"
     aspects_stream: "Aspekty"
     comment_stream:
       title: "Skomentowane wpisy"
+    commented:
+      title: "Skomentowane wpisy"
     community_spotlight_stream: "W centrum uwagi społeczności"
     followed_tag:
       add_a_tag: "Dodaj znacznik"
+      all: "Wszystkie znaczniki"
       follow: "Obserwuj"
       title: "#Obserwowane znaczniki"
     followed_tags_stream: "#Obserwowane znaczniki"
     like_stream:
       title: "Strumień polubionych"
+    liked:
+      title: "Polubione wpisy"
     mentioned_stream: "@Wzmianki"
     mentions:
       title: "@Wzmianki"
     multi:
       title: "Strumień"
     public:
-      title: "Działalność publiczna"
+      title: "Aktywność publiczna"
     tags:
       title: "Oznaczone wpisy: %{tags}"
   tag_followings:
@@ -1050,6 +1111,7 @@ pl:
       auto_follow_aspect: "Aspekt dla automatycznie dodanych użytkowników:"
       auto_follow_back: "Automatycznie zacznij udostępniać gdy ktoś zaczyna udostępniać mnie"
       change: "Zmień"
+      change_color_theme: "Zmień wariant kolorystyczny"
       change_email: "Zmiana adresu e-mail"
       change_language: "Zmiana języka"
       change_password: "Zmiana hasła"
@@ -1066,6 +1128,7 @@ pl:
       comment_on_post: "...ktoś dodał komentarz do mojego wpisu"
       current_password: "Bieżące hasło"
       current_password_expl: "to, którego używasz do logowania"
+      default_post_visibility: "Domyślne aspekty dla nowych wpisów"
       download_export: "Pobierz mój profil"
       download_export_photos: "Pobierz moje zdjęcia"
       edit_account: "Edycja konta"
@@ -1112,6 +1175,8 @@ pl:
     public:
       does_not_exist: "Użytkownik %{username} nie istnieje!"
     update:
+      color_theme_changed: "Wariant kolorystyczny został zmieniony."
+      color_theme_not_changed: "Podczas próby zmiany wariantu kolorystycznego wystąpił błąd."
       email_notifications_changed: "Ustawienia powiadomień e-mail zostały zmienione"
       follow_settings_changed: "Ustawienia obserwowania zostały zmienione"
       follow_settings_not_changed: "Nie udało się zmienić ustawień obserwowania."
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index c64f1663b..74c8a9824 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -1047,7 +1047,6 @@ pt-BR:
       posting: "Publicando..."
       remove_location: "Localização remota"
       share: "Compartilhar"
-      upload_photos: "Enviar fotos"
       whats_on_your_mind: "O que você quer compartilhar agora?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 8ea7247e9..9b0eb6fcd 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -646,7 +646,6 @@ pt-PT:
         newhere: "Novo Aqui"
       posting: "A publicar..."
       share: "Partilhar"
-      upload_photos: "Carregar fotos"
       whats_on_your_mind: "Em que está a pensar?"
     stream_element:
       via: "Via %{link}"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index a008aefa3..4e28d6518 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -39,6 +39,11 @@ ro:
       pages: "Pagini"
     user_search:
       invite: "Invită"
+      users:
+        few: "am găsit %{count} utilizatori"
+        one: "am găsit %{count} utilizator"
+        other: "am găsit %{count} utilizatori"
+        zero: "am găsit %{count} utilizatori"
   all_aspects: "All aspects"
   api:
     openid_connect:
@@ -64,37 +69,39 @@ ro:
       stay_updated: "Rămâi la curent"
       stay_updated_explanation: "Fluxul tău de date este populat cu toate contactele tale, toate etichetele pe care le urmărești și articolele publicate de unii membri creativi ai comunității."
     destroy:
-      failure: "%{name} nu este gol şi nu poate fi şters."
+      failure: "nu am putut șterge %{name}."
       success: "%{name} a fost eliminat cu succes."
     edit:
       aspect_list_is_not_visible: "lista de aspecte nu este vizibila persoanelor adaugate"
       aspect_list_is_visible: "lista de aspecte este vizibila persoanelor adaugate"
       confirm_remove_aspect: "Eşti sigur că doreşti să ştergi acest aspect?"
-      rename: "redenumeşte"
-      update: "actualizare"
-      updating: "actualizare"
+      rename: "Redenumeşte"
+      update: "Actualizează"
+      updating: "Actualizare"
     index:
       donate: "Donează"
       help:
         do_you: "Tu:"
-        feature_suggestion: "ai o sugestie de %{link}?"
-        find_a_bug: "... cauţi un %{link}?"
-        have_a_question: "... ai un %{link}?"
+        feature_suggestion: "... ai o sugestie de %{link}?"
+        find_a_bug: "... ai găsit un %{link}?"
+        have_a_question: "... ai о %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Ai nevoie de ajutor?"
         tag_bug: "bug"
+        tag_feature: "funcție"
         tag_question: "întrebare"
+        tutorial_link_text: "Îndrumări"
       introduce_yourself: "Acesta este fluxul tău. Fă-ți prezentarea."
       new_here:
-        follow: "Urmează legătura %{link} si urează-le bun venit noilor utilizatori in comunitatea Diaspora"
+        follow: "Urmează legătura %{link} si urează-le bun venit noilor utilizatori în comunitatea Diaspora"
         learn_more: "Află mai multe"
-        title: "Bun venit noilor utilizatori"
+        title: "Întâmpină utilizatorii noi"
       services:
         content: "Te poți conecta la următoarele servicii pe Diaspora"
         heading: "Conectează servciii"
       welcome_to_diaspora: "%{name}, bine ai venit in comunitatea Diaspora!"
     no_contacts_message:
-      community_spotlight: "reflectorul comunității"
+      community_spotlight: "Reflectorul comunității"
       or_spotlight: "Sau poți partaja cu %{link}"
       try_adding_some_more_contacts: "You can search (top) or invite (right) more contacts."
       you_should_add_some_more_contacts: "Ar trebui sa mai adaugi noi persoane de contact!"
@@ -138,8 +145,8 @@ ro:
     new:
       send: "Trimite"
       sending: "Trimitere..."
-      subject: "subiect"
-      to: "către"
+      subject: "Subiect"
+      to: "Către"
     show:
       delete: "sterge si blocheaza conversatia"
       reply: "raspunde"
@@ -153,11 +160,13 @@ ro:
   email: "E-mail"
   error_messages:
     helper:
-      correct_the_following_errors_and_try_again: "Corectaţi următoarele erori şi încercaţi din nou."
+      correct_the_following_errors_and_try_again: "Corectează următoarele erori şi încearcă din nou."
     need_javascript: "Pentru funcţionare proprie, acest sit necesită JavaScript. Dacă ai dezactivat JavaScript, activează-l şi reîncarcă pagina."
   fill_me_out: "Umple-mă"
   find_people: "Find people"
   help:
+    getting_help:
+      get_support_a_tutorials: "Vezi %{tutorials}le noastre"
     posts_and_posting:
       post_location_a: "În editor faceți clic pe pictograma PIN de lângă cameră. Acest lucru va introduce locația de OpenStreetMap. Puteți edita locația dvs. - dacă doriți puteți să introduceți doar orașul în loc de adresa specifică."
       post_location_q: "Cum adaug locația mea la un post?"
@@ -167,6 +176,9 @@ ro:
       post_poll_q: "Cum adaug un sondaj la mesaj?"
       post_report_a: "Faceți clic pe pictograma de alertă , triunghi, in dreapta sus a postului să o raporteze admin-ului. Introduceți un motiv pentru raportarea acestui post în caseta de dialog."
       post_report_q: "Cum pot raporta un mesaj ofensator?"
+    tags:
+      followed_tags_q: "Ce sunt „Etichetele #urmărite” și cum pot să urmăresc o etichetă?"
+    tutorials: "îndrumări"
     wiki: "Wiki"
   home:
     default:
@@ -190,15 +202,15 @@ ro:
   layouts:
     application:
       back_to_top: "Înapoi la începutul paginii"
-      whats_new: "ce mai e nou?"
+      whats_new: "Ce mai e nou?"
     header:
-      code: "codul"
+      code: "Codul"
       logout: "Ieşire"
       profile: "Profil"
       settings: "Setări"
   limited: "Limitat"
   more: "Mai mult"
-  no_results: "Niciun Rezultat Găsit"
+  no_results: "Nu am găsit nimic"
   notifications:
     also_commented:
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -229,6 +241,7 @@ ro:
         other: "şi celelalte %{count} persoane"
         zero: "şi nimeni altul"
       mark_all_as_read: "Marchează-le pe toate ca citite"
+      mark_unread: "Marchează ca necitit"
       no_notifications: "Deocamdată nu ai notificări."
       notifications: "Notificări"
     liked:
@@ -290,10 +303,21 @@ ro:
       zero: "%{actors} started sharing with you."
   notifier:
     a_post_you_shared: "o publicatie."
-    click_here: "clic aici"
+    click_here: "Clic aici"
     comment_on_post:
       limited_subject: "Există un nou comentariu la un post pe care dumneavoastra l-ati comentat anterior!"
       reply: "Răspunde sau uita-te la publicaţia lui %{name} >"
+    confirm_email:
+      click_link: "Pentru a activa adresa nouă de email %{unconfirmed_email}, urmează această legătură:"
+    export_email:
+      body: |-
+          Salut, %{name}!
+
+          Datele tale au fost procesare și sunt disponibile pentru descărcare la [această legătură](%{url}).
+
+          Cu respect,
+
+          Robotul poștal al *diasporei!
     hello: "Bună, %{name}!"
     liked:
       liked: "lui %{name} i-a plăcut publicaţia ta"
@@ -323,7 +347,7 @@ ro:
       looking_for: "Căutati publicaţii marcate cu %{tag_link}?"
       no_one_found: "... dar nimeni nu a fost găsit."
       no_results: "Hey! Trebuie sa cauţi ceva."
-      results_for: "caută rezultate pentru"
+      searching: "Caut acum, așteaptă un pic..."
     person:
       thats_you: "Eşti tu!"
     profile_sidebar:
@@ -370,6 +394,7 @@ ro:
       your_location: "Locaţia ta"
       your_name: "Numele tău"
       your_photo: "Poza ta"
+      your_tags_placeholder: "De exemplu #filme #pisici #călătorie #profesor #bucurești"
     update:
       failed: "Eşuare la actualizarea profilului"
       updated: "Profil actualizat"
@@ -379,10 +404,14 @@ ro:
     create:
       success: "Bun venit pe Diaspora!"
     new:
+      email: "Adresa email"
       enter_email: "Introduce un e-mail"
       enter_password: "Introdu o parolă (de minim şase caractere)"
       enter_password_again: "Introduce aceeaşi parolă ca şi înainte"
       enter_username: "Selectează un nume de utilizator (doar litere, numere si caractere underscore)"
+      password: "Parola"
+      sign_up: "Crează cont"
+      username: "Nume utilizator"
   reshares:
     reshare:
       deleted: "Publicaţia originală a fost ştearsa de autorul ei."
@@ -420,10 +449,12 @@ ro:
         newhere: "nouvenit"
       posting: "Publicare..."
       share: "Distribuie"
-      upload_photos: "Încarcă fotografii"
     stream_element:
       via: "prin %{link}"
+      via_mobile: "Prin mobil"
   status_messages:
+    new:
+      mentioning: "Menționare: %{person}"
     too_long: "{\"few\"=>\"please make your status messages less than %{count} characters\", \"many\"=>\"please make your status messages less than %{count} characters\", \"one\"=>\"please make your status messages less than %{count} character\", \"other\"=>\"please make your status messages less than %{count} characters\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"please make your status messages less than %{count} characters\"}"
   streams:
     activity:
@@ -431,9 +462,13 @@ ro:
     aspects:
       title: "Your Aspects"
     aspects_stream: "Aspecte"
+    community_spotlight_stream: "Portalul comunității"
     followed_tag:
-      add_a_tag: "Adaugă un tag"
-      follow: "Urmează"
+      add_a_tag: "Adaugă o etichetă"
+      all: "Toate etichetele"
+      follow: "Urmărește"
+      title: "Etichetele #urmărite"
+    followed_tags_stream: "Etichetele #urmărite"
     mentions:
       title: "Your Mentions"
     multi:
@@ -446,8 +481,8 @@ ro:
       title: "Gestionează etichetele urmărite"
   tags:
     show:
-      follow: "Urmeaza #%{tag}"
-      stop_following: "Nu mai urmari #%{tag}"
+      follow: "Urmăreste #%{tag}"
+      stop_following: "Nu mai urmări #%{tag}"
       tagged_people:
         few: "%{count} persoane etichetate cu %{tag}"
         one: "O persoană etichetată cu %{tag}"
@@ -460,7 +495,6 @@ ro:
       email_not_confirmed: "E-Mail could not be activated. Wrong link?"
     edit:
       also_commented: "...cineva comenteaza de asemenea pe publicatia unei persoane din contacte?"
-      auto_follow_back: "Automatically follow back if a someone follows you"
       change: "Modifică"
       change_email: "Change E-Mail"
       change_language: "Modifică limba"
@@ -472,8 +506,9 @@ ro:
       close_account_text: "Închide cont"
       comment_on_post: "...cineva comenteaza pe o publicatie proprie?"
       current_password: "Parola curentă"
+      current_password_expl: "cea cu care te autentifici..."
       edit_account: "Editează cont"
-      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
+      email_awaiting_confirmation: "Ți-am trimis legătura de activare la %{unconfirmed_email}. Până nu deschizi legătura și nu activezi adreasa nouă, vom continua să folosim adresa ta originală %{email}."
       export_data: "Exportare de date"
       following: "Setări redistribuire"
       liked: "...cuiva ii place ce ai publicat?"
@@ -486,17 +521,25 @@ ro:
       your_email: "E-mailul tău"
       your_handle: "Identificatorul tău pe Diaspora"
     getting_started:
+      hashtag_suggestions: "Încearcă să urmărești așa etichete ca #arta, #filme, #gif etc."
       well_hello_there: "Bun venit"
       what_are_you_in_to: "Ce interese ai?"
       who_are_you: "Cine eşti?"
+    privacy_settings:
+      ignored_users: "Utilizatori ignorați"
+      title: "Setări confidențialitate"
     public:
       does_not_exist: "Utilizatorul %{username} nu există!"
     update:
       email_notifications_changed: "Language Change Failed"
+      follow_settings_changed: "Setările de urmărire au fost modificate"
+      follow_settings_not_changed: "Modificarea setărilor de urmărire a eșuat."
       language_changed: "Limba schimbată"
       language_not_changed: "Nu s-a putut modifica limba"
       password_changed: "S-a modificat parola"
       password_not_changed: "Nu s-a putut schimba parola"
+      settings_not_updated: "Actualizarea setărilor a eșuat"
+      settings_updated: "Setările au fost actualizate"
       unconfirmed_email_changed: "E-Mail Changed. Needs activation."
       unconfirmed_email_not_changed: "E-Mail Change Failed"
   will_paginate:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 37ac1cdf6..089d9d855 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -972,7 +972,6 @@ ru:
       posting: "Отправка..."
       remove_location: "Удалить местонахождение"
       share: "Поделиться"
-      upload_photos: "Загрузить фотографии"
       whats_on_your_mind: "О чём вы думаете?"
     stream_element:
       via: "через %{link}"
diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml
index dc8c07d75..184d250bd 100644
--- a/config/locales/diaspora/sc.yml
+++ b/config/locales/diaspora/sc.yml
@@ -63,7 +63,7 @@ sc:
       confirm_remove_aspect: "Seguru ses de bòlere burrare custa cara?"
       rename: "Càmbia nùmene"
       update: "Agiorna"
-      updating: "Agiornande"
+      updating: "Agiornende"
     index:
       donate: "Dona"
       donate_liberapay: "Agiuda a liberapay"
@@ -169,6 +169,15 @@ sc:
   limited: "Limitadu"
   more: "Àteru"
   no_results: "Perunu resurtadu agatadu"
+  notifications:
+    private_message:
+      one: "%{actors} t'at imbiadu unu messàgiu."
+      other: "%{actors} t'ant imbiadu unu messàgiu."
+      zero: "%{actors} t'at imbiadu unu messàgiu."
+    started_sharing:
+      one: "%{actors} at incumintzadu a cumpartzire cun tie."
+      other: "%{actors} ant incumintzadu a cumpartzire cun tie."
+      zero: "%{actors} at incumintzadu a cumpartzire cun tie."
   notifier:
     export_photos_email:
       body: |-
@@ -182,6 +191,9 @@ sc:
       subject: "B'est unu messàgiu privadu nou pro tie"
   nsfw: "NSFW (no est adatu pro unu logu de traballu)"
   ok: "AB"
+  photos:
+    new_profile_photo:
+      upload: "Càrriga una fotografia de profilu noa!"
   privacy: "Privadesa"
   profile: "Profilu"
   public: "Pùblicu"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 78c9a3b71..7ccaa8d65 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -618,7 +618,6 @@ sk:
       posting: "Posiela sa..."
       remove_location: "Odstrániť umiestnenie"
       share: "Uverejniť"
-      upload_photos: "Nahrať fotky"
       whats_on_your_mind: "Na čo myslíš?"
     stream_element:
       via: "na %{link}"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index a74cfe0f6..14b5fe1db 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -519,7 +519,6 @@ sl:
         newhere: "NovTukaj"
       posting: "Objavljanje ..."
       share: "Objavi"
-      upload_photos: "Naložite slike"
       whats_on_your_mind: "Kaj tuhtate?"
     stream_element:
       via: "preko %{link}"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index f48425f1b..40288aef0 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -70,9 +70,9 @@ sv:
         one: "En kommentar"
         other: "%{count} kommentarer"
         zero: "Inga kommentarer"
-      current_segment: "Medelantalet inlägg per användare för segmentet <b>%{post_day}</b> är <b>%{post_yest}</b>"
+      current_segment: "Medelantalet inlägg per användare för segmentet %{post_day} är %{post_yest}"
       daily: "Dagligen"
-      display_results: "Visar resultat från segmentet <b>%{segment}</b>"
+      display_results: "Visar resultat från segmentet %{segment}"
       go: "Kör"
       month: "Månad"
       posts:
@@ -83,7 +83,7 @@ sv:
         one: "En delning"
         other: "%{count} delningar"
         zero: "Inga delningar"
-      tag_name: "Taggnamn: <b>%{name_tag}</b> Antal: <b>%{count_tag}</b>"
+      tag_name: "Taggnamn: %{name_tag} Antal: %{count_tag}"
       usage_statistic: "Användningsstatistik"
       users:
         one: "En användare"
@@ -334,7 +334,7 @@ sv:
   delete: "Ta bort"
   email: "E-post"
   error_messages:
-    csrf_token_fail: "Ogiltigt CSRF-insegel. Vanligen logga in och försök igen."
+    csrf_token_fail: "Ogiltigt CSRF-pollett. Vänligen logga in och försök igen."
     helper:
       correct_the_following_errors_and_try_again: "Rätta till följande fel och försök igen."
     need_javascript: "Denna webbplats behöver JavaScript för att fungera ordentligt. Har du inaktiverat JavaScript, får du vara så snäll att aktivera det och ladda om sidan."
@@ -662,7 +662,7 @@ sv:
       mark_all_shown_as_read: "Märk allt som läst"
       mark_read: "Lästmärk"
       mark_unread: "Markera som oläst"
-      mentioned: "Omnämnd i inlägg"
+      mentioned: "Omnämnd"
       no_notifications: "Du har inga notifikationer än."
       notifications: "Notiser"
       reshared: "Återdelad"
@@ -964,10 +964,10 @@ sv:
       terms_link: "användarvillkor"
       username: "Användarnamn"
   report:
-    comment_label: "<b>Kommentar</b>:<br>%{data}"
+    comment_label: "<b>Kommentar</b>:%{data}"
     confirm_deletion: "Vill de radera objektet?"
     delete_link: "Radera objekt"
-    not_found: "<u>Inlägget eller kommentaren fanns inte. Det tycks har blivit borttaget av användaren.</u>"
+    not_found: "Inlägget eller kommentaren fanns inte. Det tycks har blivit borttaget av användaren."
     post_label: "<b>Inlägg</b>: %{title}"
     reason_label: "Orsak:"
     reported_label: "<b>Anmält av</b> %{person}"
@@ -1053,7 +1053,6 @@ sv:
       posting: "Skickar..."
       remove_location: "Ta bort platsen"
       share: "Dela"
-      upload_photos: "Ladda upp foton"
       whats_on_your_mind: "Vad har du på hjärtat?"
     stream_element:
       via: "Via %{link}"
@@ -1096,6 +1095,8 @@ sv:
     aspects_stream: "Aspekter"
     comment_stream:
       title: "Kommenterade inlägg"
+    commented:
+      title: "Kommenterade inlägg"
     community_spotlight_stream: "Gemenskapens rampljus"
     followed_tag:
       add_a_tag: "Lägg till en tagg"
@@ -1105,6 +1106,8 @@ sv:
     followed_tags_stream: "#Följda taggar"
     like_stream:
       title: "Gilla flöde"
+    liked:
+      title: "Gillade inlägg"
     mentioned_stream: "@Omnämnanden"
     mentions:
       title: "@Omnämnanden"
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 04d692013..e8aead596 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -702,7 +702,6 @@ te:
       posting: "టపాకడుతూంది..."
       remove_location: "స్థానాన్ని తీసివేయి"
       share: "పంచుకోండి"
-      upload_photos: "ఛాయాచిత్రాలను ఎక్కించండి"
       whats_on_your_mind: "మీ బుర్రలో ఏం మెదులుతోంది?"
     stream_element:
       via: "%{link} ద్వారా"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 3199ea4ca..5df372047 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -679,7 +679,6 @@ tr:
         add_a_poll: "Oylama ekle"
       posting: "Gönderiliyor..."
       share: "Paylaş"
-      upload_photos: "Fotoğraf yükle"
       whats_on_your_mind: "Ne düşünüyorsun?"
     stream_element:
       via: "%{link} ile"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 8c587d851..6dfce7fcc 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -1090,7 +1090,6 @@ uk:
       posting: "Надсилання..."
       remove_location: "Видалити місцезнаходження"
       share: "Поділитися"
-      upload_photos: "Завантажити світлини"
       whats_on_your_mind: "Про що ви думаєте?"
     stream_element:
       via: "через %{link}"
@@ -1213,10 +1212,10 @@ uk:
       new_password: "Новий пароль"
       private_message: "ви отримали особисте повідомлення"
       receive_email_notifications: "Отримувати повідомлення електронною поштою, коли:"
-      request_export: "Запитати дані мого профелю"
-      request_export_photos: "Запросити мої фотографії"
+      request_export: "Отримати дані мого профілю"
+      request_export_photos: "Отримати мої фотографії"
       request_export_photos_update: "Оновити мої фотографії"
-      request_export_update: "Оновити дані мого профелю"
+      request_export_update: "Оновити дані мого профілю"
       reshared: "хтось ділиться вашим записом"
       show_community_spotlight: "Показувати рекомендованих користувачів у Потоці?"
       show_getting_started: "Повернути інформацію для початківців"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 1a8533ec9..36a943e28 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -466,7 +466,6 @@ vi:
         newhere: "NewHere"
       posting: "Đăng bài..."
       share: "Chia sẻ"
-      upload_photos: "Tải ảnh lên"
       whats_on_your_mind: "Bạn đang nghĩ gì?"
     stream_element:
       via: "thông qua %{link}"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 2e064b14f..7fc24f428 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -443,7 +443,6 @@ zh-CN:
         newhere: "新用户"
       posting: "发布中……"
       share: "分享"
-      upload_photos: "上载照片"
       whats_on_your_mind: "您想到了什么？"
     stream_element:
       via: "通过 %{link}"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 50e5abdc6..5982d4667 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -1012,7 +1012,6 @@ zh-TW:
       posting: "發表中..."
       remove_location: "移除位置資訊"
       share: "分享"
-      upload_photos: "上傳相片"
       whats_on_your_mind: "在想什麼呢？"
     stream_element:
       via: "經由%{link}"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index f7e40e37e..b28b5ca90 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -170,6 +170,7 @@ da:
       invalid_ext: "{file} har en ugyldig filtype. Kun {extensions} er tilladt."
       looking_good: "Du ser virkelig pæn ud!"
       size_error: "{file} er for stor. Maksimal filstørrelse er {sizeLimit}."
+      upload_photos: "Upload fotografier"
     poll:
       answer_count:
         one: "1 stemme"
diff --git a/config/locales/javascript/javascript.de-CH.yml b/config/locales/javascript/javascript.de-CH.yml
index bd62fdfa0..1fcc5d653 100644
--- a/config/locales/javascript/javascript.de-CH.yml
+++ b/config/locales/javascript/javascript.de-CH.yml
@@ -6,23 +6,91 @@
 
 de-CH:
   javascripts:
+    and: "und"
+    aspect_dropdown:
+      add_to_aspect: "Kontakt hinzuefüege"
+      all_aspects: "Ali Aspekt"
+      error: "Teile mit <%= name %> isch fehlgschlage. Ignoriersch du das Individuum?"
+      error_remove: "<%= name %> us dim Aspekt entferne het nöd klappet :("
+      select_aspects: "Aspekt uswählä"
+      started_sharing_with: "Du hesch aagfange mit <%= name %> z'teile!"
+      stopped_sharing_with: "Du hesch mit <%= name %> ufghöhrt z'teile."
+      toggle:
+        one: "I eim Aspekt"
+        other: "I <%= count %> Aspekt"
+    aspect_navigation:
+      add_an_aspect: "+ Aspekt hinzuefüege"
+      deselect_all: "Ali abwähle"
+      no_aspects: "Kei Aspekt usgwählt"
+      select_all: "Ali aawähle"
+    bookmarklet:
+      post_something: "Erstell en Biitrag i diaspora*"
+      post_submit: "Biitrag wird übermittlet..."
+      post_success: "Teilt! Popup-Fenster wird etz zuegmacht..."
+    comma: ","
+    comments:
+      hide: "Kommentär verstecke"
+      no_comments: "Kei Kommentär bis etz."
+      show: "Ali Kommentär aazeige"
     confirm_dialog: "Bisch sicher?"
+    contacts:
+      add_contact: "Kontakt hinzuefüege"
+      aspect_list_is_not_visible: "Kontäkt i dem Aspekt gsehnd sich gegesiitig nöd."
+      aspect_list_is_visible: "Kontäkt i dem Aspekt chönd sich gegesiitig gseh."
+      error_add: "<%= name %> het nöd chöne zum Aspekt hinzuegfüegt werde."
+      error_remove: "<%= name %> het nöd chöne vom Aspekt entfernt werde."
+      remove_contact: "Kontakt entferne"
     delete: "Lösche"
+    edit: "bearbeite"
+    failed_to_post_message: "Biitrag absende isch fehlgschlage!"
+    failed_to_remove: "Enferne vom Biitrag isch fehlgschlage!"
+    getting_started:
+      alright_ill_wait: "Ok, ich warte."
+      hey: "Hey, <%= name %>!"
+      no_tags: "Hey, du folgsch no kei Tags! Trotzdem wiitermache?"
+      preparing_your_stream: "Din persönliche Stream wird vorbereitet..."
     header:
+      admin: "Admin"
+      close: "Schlüsse"
       contacts: "Kontäkt"
       conversations: "Nochrichte"
       help: "Hilf"
+      home: "Home"
       log_out: "Abmelde"
+      mark_all_as_read: "Ali als glese markiere"
       notifications: "Benochtichtigunge"
       profile: "Profil"
+      recent_notifications: "Chürzlichi Benochrichtigunge"
       search: "Sueche"
       settings: "Iistellige"
       view_all: "Alli aazeige"
     ignore: "Ignoriere"
+    ignore_failed: "Benutzer ignoriere isch fehlgschlage"
+    ignore_user: "De Benutzer ignoriere?"
     my_activity: "Mini Aktivitätä"
+    my_aspects: "Mini Aspekt"
+    my_stream: "Stream"
+    no_results: "Kei Ergebnis gfunde."
+    notifications:
+      mark_read: "Als glese markiere"
+      mark_unread: "Als unglese markiere"
+    people:
+      not_found: "...niemer isch gfunde worde."
     photo_uploader:
+      completed: "<%= file %> ueglade"
+      empty: "{file} isch läär bitte wähl d'Datei nomol uus."
+      error: "En Fehler isch bim ufelade vo <%= file %> passiert"
+      invalid_ext: "{file} het e ungültigi Dateiendig. Erlaubt sind nur: {extensions}"
       looking_good: "OMG, du gsesch super us!"
+      size_error: "{file} isch z'gross, di maximali Grössi isch {sizeLimit}."
+      upload_photos: "Fotis ufelade"
     poll:
+      close_result: "Ergebnis usblende"
+      count:
+        one: "Ei Stimm bis etz"
+        other: "<%=count%> Stimme bis etz"
+      result: "Ergebnis"
+      show_result: "Ergebnis aazeige"
       vote: "Abstimme"
     profile:
       bio: "Beschriibig"
@@ -32,23 +100,59 @@ de-CH:
       location: "Ort"
       photos: "Fotis"
       posts: "Biiträg"
+    publisher:
+      add_option: "Antwort hinzuefüege"
+      limited: "Limitiert: din post wird nur vo lüüt iisehbar sii mit dene du teilsch"
+      near_from: "Gschickt i de Nöchi vo <%= location %>"
+      option: "Antwort"
+      public: "Öffentlich: din biitrag wird für ali iisehbar si und vo suechmaschine gfunde werde."
+      question: "Frog"
+    report:
+      name: "Melde"
+      prompt: "Bitte en Grund aageh:"
+      prompt_default: "zB. astössige Inhalt."
+      status:
+        created: "D'Meldig isch erfolgriich erstellt worde."
+        exists: "Die Meldig existiert scho"
+    reshares:
+      post: "De Biitrag vo <%= name %> wiitersägä?"
+      successful: "De Biitrag isch erfolgriich wiitergseit worde."
     show_more: "Meh aazeige"
     stream:
       comment: "Kommentiere"
       follow: "Folge"
+      followed_tag:
+        add_a_tag: "Täg hinzuefüge"
+        follow: "Folge"
+        title: "#tags dene du folgsch"
       hide: "Verstecke"
+      hide_nsfw_posts: "Versteck #nsfw Biiträg"
       like: "Gfallt mer"
       likes:
         one: "Öpperem gfällt da"
         other: "<%= count %> Lüüt gfällt da"
         zero: "Niemertem gfällt da"
       limited: "Begrenzt"
+      more_comments:
+        one: "Ein zuesätzliche Kommentar aazeige"
+        other: "<%= count %> zuesätzlichi Kommentär aazeige"
+      original_post_deleted: "Original-Biitrag vom Verfasser glöscht."
       public: "Öffentlich"
       reshare: "Wiitersägä"
+      reshares:
+        one: "Ein Reshare"
+        other: "<%= count %> Reshares"
       show_nsfw_post: "Biitrag aazeige"
       show_nsfw_posts: "Alli aazeige"
+      tags:
+        follow: "Folg #<%= tag %>"
+        following: "Du folgsch #<%= tag %>"
+        stop_following: "Hör uf #<%= tag %> z'folge"
       unfollow: "Nüm folge"
       unlike: "Gfallt mer nüme"
+      via: "via <%= provider %>"
+    tags:
+      wasnt_that_interesting: "Ok gseht us als wär <%= tagName %> doch ned so interessant..."
     timeago:
       day: "eim Tag"
       days:
@@ -76,4 +180,6 @@ de-CH:
       year: "öpe eim Johr"
       years:
         one: "eim Johr"
-        other: "%d Johr"
\ No newline at end of file
+        other: "%d Johr"
+    viewer:
+      reshared: "Wiitergseit"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 85c5a0edb..e41eac08d 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -171,6 +171,7 @@ de:
       invalid_ext: "{file} hat eine ungültige Erweiterung. Nur {extensions} sind erlaubt."
       looking_good: "OMG, du siehst toll aus!"
       size_error: "{file} ist zu groß. Die maximale Dateigröße beträgt {sizeLimit}."
+      upload_photos: "Fotos hochladen"
     poll:
       answer_count:
         one: "1 Stimme"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 1f033956c..b72ad7d7a 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -170,6 +170,7 @@ de_formal:
       invalid_ext: "{file} hat eine ungültige Erweiterung. Nur {extensions} sind erlaubt."
       looking_good: "OMG, Sie sehen toll aus!"
       size_error: "{file} ist zu groß. Die maximale Dateigröße beträgt {sizeLimit}."
+      upload_photos: "Fotos hochladen"
     poll:
       answer_count:
         one: "Eine Stimme"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 3a93a9d5e..5ef87d181 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -210,6 +210,7 @@ en:
       alright_ill_wait: "All right, I’ll wait."
       preparing_your_stream: "Preparing your personalized stream..."
     photo_uploader:
+      upload_photos: "Upload photos"
       looking_good: "OMG, you look awesome!"
       completed: "<%= file %> completed"
       error: "A problem occurred while uploading file <%= file %>"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 790b80cbe..726697f3a 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -162,6 +162,7 @@ es:
       invalid_ext: "{file} tiene una extensión inválida. Solo se permiten {extensions}."
       looking_good: "¡Guau, estás increíble!"
       size_error: "{file} es demasiado grande, el tamaño máximo es de {sizeLimit}."
+      upload_photos: "Subir fotos"
     poll:
       answer_count:
         one: "1 voto"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 381f67b42..44c199cc9 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -171,6 +171,7 @@ fr:
       invalid_ext: "{file} a une extension invalide. Seules {extensions} sont permises."
       looking_good: "Impressionnant, vous avez un super look !"
       size_error: "{file} est trop gros, la taille maximum est de {sizeLimit}."
+      upload_photos: "Envoyer des photos"
     poll:
       answer_count:
         one: "<%=count%> vote"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index e3af03d8f..06ae680fa 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -165,6 +165,7 @@ ja:
       invalid_ext: "{file}の拡張子は正しくありません。{extensions}以外の拡張子は使えません。"
       looking_good: "なんてこったー！あなたは素晴らしいですね！"
       size_error: "{file}は大きすぎます。ファイルサイズの上限は{sizeLimit}です。"
+      upload_photos: "写真をアップロード"
     poll:
       answer_count:
         other: "<%=count%> 投票"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index 4e042f80f..c85e8ce31 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -29,8 +29,13 @@ nn:
       hide: "gøym merknader"
       show: "syn alle merknadene"
     confirm_dialog: "Er du sikker?"
+    conversation:
+      create:
+        no_recipient: "Heisann, du treng ein mottakar først!"
     delete: "Slett"
     edit: "Endra"
+    errors:
+      connection: "Kunne ikkje kople til serveren."
     failed_to_post_message: "Klarte ikkje å senda meldinga."
     getting_started:
       alright_ill_wait: "Greitt, eg ventar."
@@ -55,6 +60,10 @@ nn:
     my_activity: "Min aktivitet"
     my_aspects: "Aspekta mine"
     my_stream: "Straum"
+    notifications:
+      new_notifications:
+        one: "Du har eit varsel du ikkje har sjekka"
+        other: "Du har <%= count %> ulesne varsel"
     people:
       not_found: "orsak, me kunne ikkje finne nokon."
     photo_uploader:
@@ -62,6 +71,28 @@ nn:
       looking_good: "Du verda, du ser flott ut!"
     publisher:
       limited: "Avgrensa - berre personar du deler med vil kunna sjå meldinga"
+      markdown_editor:
+        preview: "Førehandsvis"
+        texts:
+          code: "kode her"
+          heading: "overskrift"
+          italic: "kursiv"
+          list: "liste her"
+          quote: "sitat her"
+          strong: "feit"
+        tooltips:
+          bold: "Feit"
+          cancel: "Ikkje send melding"
+          code: "Set inn kode"
+          insert_image: "Set inn bilete"
+          insert_link: "Set inn lenke"
+          insert_ordered_list: "Set inn nummerert liste"
+          insert_unordered_list: "Set inn unummerert liste"
+          italic: "Kursiv"
+          preview: "Førehandsvis melding"
+          quote: "Set inn sitat"
+          write: "Endre melding"
+        write: "Skriv"
       public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
     reshares:
       post: "Vil du dele <%= name %> sin post?"
@@ -69,6 +100,10 @@ nn:
     show_more: "syn meir"
     stream:
       comment: "Kommenter"
+      comments:
+        one: "ein kommentar"
+        other: "<%= count %> kommentarar"
+        zero: "ingen kommentarar"
       follow: "Følg"
       followed_tag:
         add_a_tag: "Legg til ein tag"
@@ -86,6 +121,7 @@ nn:
         one: "Syn <%= count %> kommentar meir"
         other: "Syn <%= count %> fleire kommentarar"
         zero: "Syn <%= count %> fleire kommentarar"
+      no_posts_yet: "Det er ikkje nokon innlegg å vise her enno."
       original_post_deleted: "Det opprinnelege innlegget er sletta av forfattaren."
       public: "Offentleg"
       reshare: "Del"
diff --git a/config/locales/javascript/javascript.oc.yml b/config/locales/javascript/javascript.oc.yml
index f3196561e..a76385f06 100644
--- a/config/locales/javascript/javascript.oc.yml
+++ b/config/locales/javascript/javascript.oc.yml
@@ -172,6 +172,7 @@ oc:
       invalid_ext: "{file} a una extension invalida, Solas {extensions} son permesas."
       looking_good: "Impressionant, avètz un super estil !"
       size_error: "{file} es tròp gròs, la talha maximala es de {sizeLimit}."
+      upload_photos: "Mandar de fotografias"
     poll:
       answer_count:
         one: "1 vòte"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 77e8edbe2..60e035ff2 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -6,6 +6,42 @@
 
 pl:
   javascripts:
+    admin:
+      pods:
+        actions: "Akcje"
+        added: "Dodane"
+        check: "wykonaj test połączenia"
+        follow_link: "otwórz łącze w przeglądarce"
+        last_check: "ostatnio sprawdzone:"
+        more_info: "pokaż więcej informacji"
+        no_info: "Jak dotąd nie ma dodatkowych informacji"
+        not_available: "niedostępne"
+        offline_since: "offline od:"
+        pod: "Pod"
+        recheck:
+          failure: "Nie udało się sprawdzić."
+          success: "Pod został właśnie ponownie sprawdzony."
+        response_time: "Czas odpowiedzi:"
+        server_software: "Oprogramowanie serwera:"
+        ssl: "SSL"
+        ssl_disabled: "SSL wyłączone"
+        ssl_enabled: "SSL włączone"
+        states:
+          dns_failed: "Rozwiązanie nazwy domenowej (DNS) nie powiodło się"
+          http_failed: "Nie udało się nawiązać połączenia HTTP"
+          net_failed: "Nie udało się połączyć"
+          no_errors: "OK"
+          ssl_failed: "Nie udało się połączyć poprzez SSL"
+          unknown_error: "Podczas sprawdzania wystąpił nieoczekiwany błąd"
+          version_failed: "Nie udało się pobrać wersji oprogramowania"
+        status: "Status"
+        unknown: "nieznane"
+    admins:
+      dashboard:
+        compare_versions: "Najnowsza wersja diaspory* to <%= latestVersion %>, a Twój pod używa <%= podVersion %>."
+        error: "Nie udało się sprawdzić jaka jest najnowsza wersja diaspory*."
+        outdated: "Twój pod wymaga aktualizacji."
+        up_to_date: "Twój pod nie wymaga aktualizacji!"
     and: "i"
     aspect_dropdown:
       add_to_aspect: "Dodaj kontakt"
@@ -58,11 +94,15 @@ pl:
       remove_contact: "Usuń kontakt"
       search_no_results: "Nie znaleziono użytkowników"
     conversation:
+      create:
+        no_recipient: "Hej, najpierw musisz dodać odbiorcę!"
       new:
         no_contacts: "Przed rozpoczęciem rozmowy musisz dodać kontakty"
     create: "Utwórz"
     delete: "Usuń"
     edit: "Edycja"
+    errors:
+      connection: "Nie udało się połączyć z serwerem."
     failed_to_post_message: "Nie można wysłać wiadomości!"
     failed_to_remove: "Nie udało się usunąć wartości!"
     getting_started:
@@ -79,11 +119,14 @@ pl:
       home: "Strona główna"
       log_out: "Wyloguj"
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
+      moderator: "Moderator"
       notifications: "Powiadomienia"
       profile: "Profil"
       recent_notifications: "Ostatnie powiadomienia"
       search: "Szukaj"
       settings: "Ustawienia"
+      toggle_mobile: "Przełącz widok mobilny"
+      toggle_navigation: "Przełącz nawigację"
       view_all: "Wyświetl wszystko"
     hide_post: "Ukryj wpis?"
     hide_post_failed: "Nie można ukryć tego wpisu"
@@ -113,6 +156,7 @@ pl:
       invalid_ext: "{file} ma niewłaściwe rozszerzenie. Akceptowane rozszerzenia to: {extensions}."
       looking_good: "O rety! Świetnie wyglądasz!"
       size_error: "{file} jest za duży. Maksymalny rozmiar pliku to {sizeLimit}."
+      upload_photos: "Prześlij zdjęcia"
     poll:
       close_result: "Ukryj wynik"
       count:
@@ -140,6 +184,34 @@ pl:
     publisher:
       add_option: "Dodaj odpowiedź"
       limited: "Ograniczony - wpis będzie widoczny tylko dla wybranej grupy osób"
+      markdown_editor:
+        preview: "Podgląd"
+        texts:
+          code: "tutaj wpisz kod"
+          heading: "tekst nagłówka"
+          insert_image_description_text: "podaj opis obrazu"
+          insert_image_help_text: "Podaj odnośnik obrazu"
+          insert_image_title: "podaj tytuł obrazu"
+          insert_link_description_text: "podaj opis odnośnika"
+          insert_link_help_text: "Podaj odnośnik"
+          italic: "pochyły tekst"
+          list: "podaj treść elementu listy"
+          quote: "podaj treść cytatu"
+          strong: "pogrubiony tekst"
+        tooltips:
+          bold: "Pogrubienie"
+          cancel: "Anuluj tworzenie wiadomości"
+          code: "Wstaw kod"
+          heading: "Nagłówek"
+          insert_image: "Wstaw obraz"
+          insert_link: "Wstaw odnośnik"
+          insert_ordered_list: "Wstaw listę uporządkowaną"
+          insert_unordered_list: "Wstaw listę nieuporządkowaną"
+          italic: "Kursywa"
+          preview: "Zobacz jak wpis będzie wyglądać"
+          quote: "Wstaw cytat"
+          write: "Edytuj wpis"
+        write: "Edycja"
       near_from: "Blisko <%= location %>"
       option: "Odpowiedź"
       public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki"
@@ -181,7 +253,9 @@ pl:
         one: "Wyświetl <%= count %> komentarz więcej"
         other: "Wyświetl <%= count %> komentarzy więcej"
         zero: "Wyświetl <%= count %> komentarzy więcej"
+      no_posts_yet: "Nie ma jeszcze wpisów które można by tu wyświetlić."
       original_post_deleted: "Oryginalny wpis został usunięty przez autora."
+      permalink: "Łącze bezpośrednie"
       public: "Publiczny"
       reshare: "Przekaż dalej"
       reshares:
@@ -211,6 +285,7 @@ pl:
       hour: "około godziny"
       hours:
         other: "około %d godzin"
+      inPast: "w każdej chwili"
       minute: "około minuty"
       minutes:
         other: "%d minut"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index ee09e8a34..cc1800ea6 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -170,8 +170,9 @@ pt-BR:
       empty: "{file} está vazio, por favor selecione arquivos novamente sem este."
       error: "Ocorreu um problema ao fazer upload do arquivo <%= file %>"
       invalid_ext: "{file} possui extensão inválida. Somente {extensions} são permitidas."
-      looking_good: "OMG, veja você é incrível!"
+      looking_good: "Uau, arrasou!"
       size_error: "{file} é muito grande, o tamanho máximo do arquivo é {sizeLimit}."
+      upload_photos: "Subir fotos"
     poll:
       answer_count:
         one: "Um voto"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 97357603b..19b202336 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -6,6 +6,9 @@
 
 ro:
   javascripts:
+    admin:
+      pods:
+        follow_link: "deschide legătura în browser"
     and: "și"
     aspect_dropdown:
       add_to_aspect: "Adaugă la contacte"
@@ -58,6 +61,7 @@ ro:
       invalid_ext: "{file} are o extensie invalidă. Doar extensiile {extensions} sunt permise."
       looking_good: "WOW, arati super!"
       size_error: "{file} este prea mare, mărimea maximă a unui fişier este {sizeLimit}."
+      upload_photos: "Încarcă fotografii"
     profile:
       posts: "Postări"
     publisher:
@@ -67,10 +71,11 @@ ro:
     show_more: "arată mai mult"
     stream:
       comment: "Comentariu"
-      follow: "Urmează"
+      follow: "Urmărește"
       followed_tag:
         add_a_tag: "Adaugă o etichetă"
-        follow: "Urmează"
+        follow: "Urmărește"
+        title: "Etichetele #urmărite"
       hide: "Ascunde"
       hide_nsfw_posts: "Ascunde #nsfw articole"
       like: "Îmi place"
@@ -102,7 +107,9 @@ ro:
       show_nsfw_post: "Afișare articol"
       show_nsfw_posts: "Arată tot"
       tags:
-        following: "Urmărind #<%= tag %>"
+        follow: "Urmărește #<%= tag %>"
+        following: "Urmărești #<%= tag %>"
+        stop_following: "Nu mai urmări #<%= tag %>"
         stop_following_confirm: "Să nu mai urmăresc #<%= tag %>?"
       unfollow: "Nu mai urmări"
       unlike: "Nu ȋmi place"
diff --git a/config/locales/javascript/javascript.sc.yml b/config/locales/javascript/javascript.sc.yml
index 72af9ea88..1bfdf63d6 100644
--- a/config/locales/javascript/javascript.sc.yml
+++ b/config/locales/javascript/javascript.sc.yml
@@ -8,6 +8,8 @@ sc:
   javascripts:
     header:
       moderator: "Moderatore"
+    photo_uploader:
+      upload_photos: "Càrriga fotografias"
     publisher:
       mention_success: "Etichetados curretamente: <%= names %>"
     timeago:
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 7eee84156..331d76656 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -228,6 +228,7 @@ sv:
           quote: "Infoga citat"
           write: "Ändra meddelande"
         write: "Skriv"
+      mention_success: "Lyckades nämna: <%= names %>"
       near_from: "Sänt från: <%= location %>"
       option: "Alternativ"
       public: "Publikt: ditt inlägg visas för alla och i söktjänster"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index f7ce5f578..682c66c91 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -165,6 +165,7 @@ zh-TW:
       invalid_ext: "檔案 {file} 的副檔名不合格。僅接受 {extensions}。"
       looking_good: "天啊，你看起來真帥！"
       size_error: "檔案 {file} 太大了，上限是{sizeLimit}。"
+      upload_photos: "上傳相片"
     poll:
       answer_count:
         other: "有<%=count%>個人投票"
diff --git a/config/routes.rb b/config/routes.rb
index 2064f4475..b75883051 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -10,10 +10,6 @@ Diaspora::Application.routes.draw do
 
   resources :report, except: %i(edit new show)
 
-  if Rails.env.production?
-    mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
-  end
-
   constraints ->(req) { req.env["warden"].authenticate?(scope: :user) &&
                         req.env['warden'].user.admin? } do
     mount Sidekiq::Web => '/sidekiq', :as => 'sidekiq'
diff --git a/features/mobile/activity_stream.feature b/features/mobile/activity_stream.feature
index 72a444c79..27475abcd 100644
--- a/features/mobile/activity_stream.feature
+++ b/features/mobile/activity_stream.feature
@@ -1,5 +1,5 @@
 @javascript @mobile
-Feature: Viewing my activity on the steam mobile page
+Feature: Viewing my activity on the stream mobile page
   In order to navigate Diaspora*
   As a mobile user
   I want to view my activity stream
diff --git a/features/mobile/stream.feature b/features/mobile/stream.feature
new file mode 100644
index 000000000..02301cd47
--- /dev/null
+++ b/features/mobile/stream.feature
@@ -0,0 +1,16 @@
+@javascript @mobile
+Feature: Viewing the main stream mobile page
+
+  Background:
+    Given following users exist:
+      | username   |
+      | alice      |
+      | bob        |
+    And a user with username "bob" is connected with "alice"
+    And "alice@alice.alice" has a public post with text "Hello! I am #newhere"
+
+  Scenario: Show post with correct timestamp
+    When I sign in as "bob@bob.bob" on the mobile website
+    And I go to the stream page
+    Then I should see "Hello! I am #newhere" within ".ltr"
+    And I should see "less than a minute ago" within "#main_stream"
diff --git a/lib/node_info.rb b/lib/node_info.rb
index eb012f98e..789bdd64d 100644
--- a/lib/node_info.rb
+++ b/lib/node_info.rb
@@ -2,7 +2,7 @@ require "pathname"
 require "json-schema"
 
 module NodeInfo
-  VERSIONS = %w(1.0)
+  VERSIONS = %w(1.0 2.0).freeze
   SCHEMAS = {}
   private_constant :VERSIONS, :SCHEMAS
 
@@ -21,17 +21,21 @@ module NodeInfo
       end
     end
 
-    Protocols = Struct.new(:inbound, :outbound) do
-      def initialize(inbound=[], outbound=[])
-        super(inbound, outbound)
+    Protocols = Struct.new(:protocols) do
+      def initialize(protocols=[])
+        super(protocols)
       end
 
       def version_10_hash
         {
-          "inbound"  => inbound,
-          "outbound" => outbound
+          "inbound"  => protocols,
+          "outbound" => protocols
         }
       end
+
+      def version_20_array
+        protocols
+      end
     end
 
     Services = Struct.new(:inbound, :outbound) do
@@ -90,6 +94,8 @@ module NodeInfo
       case version
       when "1.0"
         version_10_hash
+      when "2.0"
+        version_20_hash
       end
     end
 
@@ -124,6 +130,18 @@ module NodeInfo
       )
     end
 
+    def version_20_hash
+      deep_compact(
+        "version"           => "2.0",
+        "software"          => software.version_10_hash,
+        "protocols"         => protocols.version_20_array,
+        "services"          => services.version_10_hash,
+        "openRegistrations" => open_registrations,
+        "usage"             => usage.version_10_hash,
+        "metadata"          => metadata
+      )
+    end
+
     def deep_compact(hash)
       hash.tap do |hash|
         hash.reject! {|_, value|
diff --git a/spec/controllers/node_info_controller_spec.rb b/spec/controllers/node_info_controller_spec.rb
index be7ca72a5..6a3a94250 100644
--- a/spec/controllers/node_info_controller_spec.rb
+++ b/spec/controllers/node_info_controller_spec.rb
@@ -15,6 +15,9 @@ describe NodeInfoController do
       expect(jrd).to include "links" => [{
         "rel"  => "http://nodeinfo.diaspora.software/ns/schema/1.0",
         "href" => node_info_url("1.0")
+      }, {
+        "rel"  => "http://nodeinfo.diaspora.software/ns/schema/2.0",
+        "href" => node_info_url("2.0")
       }]
     end
   end
@@ -28,24 +31,27 @@ describe NodeInfoController do
       end
     end
 
-    context "version 1.0" do
-      it "responds to JSON" do
-        get :document, version: "1.0", format: :json
+    %w(1.0 2.0).each do |version|
+      context "version #{version}" do
+        it "responds to JSON" do
+          get :document, version: version, format: :json
 
-        expect(response).to be_success
-      end
+          expect(response).to be_success
+        end
 
-      it "calls NodeInfoPresenter" do
-        expect(NodeInfoPresenter).to receive(:new).with("1.0")
-          .and_return(double(as_json: {}, content_type: "application/json"))
+        it "calls NodeInfoPresenter" do
+          expect(NodeInfoPresenter).to receive(:new).with(version)
+            .and_return(double(as_json: {}, content_type: "application/json"))
 
-        get :document, version: "1.0", format: :json
-      end
+          get :document, version: version, format: :json
+        end
 
-      it "notes the schema in the content type" do
-        get :document, version: "1.0", format: :json
+        it "notes the schema in the content type" do
+          get :document, version: version, format: :json
 
-        expect(response.content_type).to eq "application/json; profile=http://nodeinfo.diaspora.software/ns/schema/1.0#"
+          expect(response.content_type)
+            .to eq("application/json; profile=http://nodeinfo.diaspora.software/ns/schema/#{version}#")
+        end
       end
     end
   end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index a80f9f37e..327780607 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -4,6 +4,7 @@
 
 describe UsersController, :type => :controller do
   include_context :gon
+  include PostsHelper
 
   before do
     @user = alice
@@ -46,20 +47,40 @@ describe UsersController, :type => :controller do
   end
 
   describe '#public' do
-    it 'renders xml if atom is requested' do
-      sm = FactoryGirl.create(:status_message, :public => true, :author => @user.person)
-      get :public, :username => @user.username, :format => :atom
-      expect(response.body).to include(sm.text)
-    end
+    context "entry xml contents" do
+      before do
+        @sm = FactoryGirl.create(
+          :status_message,
+          public: true,
+          author: @user.person,
+          text:   "Go to http://diasporafoundation.org/ now!"
+        )
+      end
 
-    it 'renders xml if atom is requested with clickalbe urls' do
-      sm = FactoryGirl.create(:status_message, :public => true, :author => @user.person)
-      @user.person.posts.each do |p|
-        p.text = "Goto http://diasporaproject.org/ now!"
-        p.save
+      it "contains the text" do
+        get :public, username: @user.username, format: :atom
+        doc = Nokogiri::XML(response.body)
+        expect(doc.css("entry content")[0].content).to eq(@sm.message.markdownified(disable_hovercards: true))
+      end
+
+      it "contains the title" do
+        get :public, username: @user.username, format: :atom
+        doc = Nokogiri::XML(response.body)
+        expect(doc.css("entry title")[0].content).to eq(post_page_title(@sm))
+      end
+
+      it "contains the author" do
+        get :public, username: @user.username, format: :atom
+        doc = Nokogiri::XML(response.body)
+        expect(doc.css("entry author name")[0].content).to eq(@sm.author_name)
+      end
+
+      it "contains the original author for reshares" do
+        FactoryGirl.create(:reshare, root: @sm, author: bob.person)
+        get :public, username: bob.username, format: :atom
+        doc = Nokogiri::XML(response.body)
+        expect(doc.css("entry author name")[0].content).to eq(@sm.author_name)
       end
-      get :public, :username => @user.username, :format => :atom
-      expect(response.body).to include('a href')
     end
 
     it 'includes reshares in the atom feed' do
diff --git a/spec/helpers/posts_helper_spec.rb b/spec/helpers/posts_helper_spec.rb
index d10e529e4..1b5f1f182 100644
--- a/spec/helpers/posts_helper_spec.rb
+++ b/spec/helpers/posts_helper_spec.rb
@@ -17,6 +17,13 @@ describe PostsHelper, :type => :helper do
         post_page_title(post)
       end
     end
+
+    context "with a reshare" do
+      it "returns 'Reshare by...'" do
+        reshare = FactoryGirl.create(:reshare, author: alice.person)
+        expect(post_page_title(reshare)).to eq I18n.t("posts.show.reshare_by", author: reshare.author_name)
+      end
+    end
   end
 
 
diff --git a/spec/javascripts/mobile/mobile_comments_spec.js b/spec/javascripts/mobile/mobile_comments_spec.js
index 7a751443f..e87a81adc 100644
--- a/spec/javascripts/mobile/mobile_comments_spec.js
+++ b/spec/javascripts/mobile/mobile_comments_spec.js
@@ -144,7 +144,7 @@ describe("Diaspora.Mobile.Comments", function(){
       expect(this.toggleReactionsLink.text().trim()).toBe("6 comments");
     });
 
-    it("Creates the reaction link when no reactions", function(){
+    it("Creates the reaction link when there are no reactions", function() {
       var parent = this.toggleReactionsLink.parent();
       var postGuid = this.bottomBar.parents(".stream-element").data("guid");
       this.toggleReactionsLink.remove();
@@ -155,6 +155,18 @@ describe("Diaspora.Mobile.Comments", function(){
       expect(this.toggleReactionsLink.text().trim()).toBe("1 comment");
       expect(this.toggleReactionsLink.attr("href")).toBe("/posts/" + postGuid + "/comments.mobile");
     });
+
+    it("Creates the reaction link when there are no reactions (french locale)", function() {
+      var parent = this.toggleReactionsLink.parent();
+      var postGuid = this.bottomBar.parents(".stream-element").data("guid");
+      this.toggleReactionsLink.remove();
+      parent.prepend($("<span/>", {"class": "show-comments"}).text("Aucun commentaire"));
+
+      Diaspora.Mobile.Comments.increaseReactionCount(this.bottomBar);
+      this.toggleReactionsLink = this.bottomBar.find(".show-comments").first();
+      expect(this.toggleReactionsLink.text().trim()).toBe("1 comment");
+      expect(this.toggleReactionsLink.attr("href")).toBe("/posts/" + postGuid + "/comments.mobile");
+    });
   });
 
   describe("bottomBarLazy", function(){
diff --git a/spec/lib/connection_tester_spec.rb b/spec/lib/connection_tester_spec.rb
index 85dd5d0a2..6f2fcaaf5 100644
--- a/spec/lib/connection_tester_spec.rb
+++ b/spec/lib/connection_tester_spec.rb
@@ -116,8 +116,7 @@ describe ConnectionTester do
       ni_document = NodeInfo.build do |doc|
         doc.version = "1.0"
         doc.open_registrations = true
-        doc.protocols.inbound << "diaspora"
-        doc.protocols.outbound << "diaspora"
+        doc.protocols.protocols << "diaspora"
         doc.software.name = "diaspora"
         doc.software.version = "a.b.c.d"
       end
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index bb2bb7d6b..f9e76db51 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -479,6 +479,19 @@ describe Person, :type => :model do
     end
   end
 
+  describe "#public_key" do
+    it "returns the public key for the person" do
+      key = @person.public_key
+      expect(key).to be_a(OpenSSL::PKey::RSA)
+      expect(key.to_s).to eq(@person.serialized_public_key)
+    end
+
+    it "handles broken keys and returns nil" do
+      @person.update_attributes(serialized_public_key: "broken")
+      expect(@person.public_key).to be_nil
+    end
+  end
+
   context 'people finders for webfinger' do
     let(:user) { FactoryGirl.create(:user) }
     let(:person) { FactoryGirl.create(:person) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index da59913ce..f12f0390c 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -875,6 +875,12 @@ describe User, :type => :model do
         user.send_welcome_message
         expect(user.conversations.count).to eq 0
       end
+
+      it "should send no welcome message if podmin is invalid" do
+        AppConfig.admins.account = "invalid"
+        user.send_welcome_message
+        expect(user.conversations.count).to eq 0
+      end
     end
 
     context "with welcome message disabled" do
diff --git a/spec/presenters/node_info_presenter_spec.rb b/spec/presenters/node_info_presenter_spec.rb
index 6c168a8e6..737ee07f7 100644
--- a/spec/presenters/node_info_presenter_spec.rb
+++ b/spec/presenters/node_info_presenter_spec.rb
@@ -128,5 +128,40 @@ describe NodeInfoPresenter do
         expect(hash).to include "metadata" => include("xmppChat" => true)
       end
     end
+
+    context "when admin account is set" do
+      before do
+        AppConfig.admins.account = "podmin"
+      end
+
+      it "adds the admin account username" do
+        expect(hash).to include "metadata" => include("adminAccount" => "podmin")
+      end
+    end
+
+    context "version 2.0" do
+      it "provides generic pod data in json" do
+        expect(NodeInfoPresenter.new("2.0").as_json.as_json).to eq(
+          "version"           => "2.0",
+          "software"          => {
+            "name"    => "diaspora",
+            "version" => AppConfig.version_string
+          },
+          "protocols"         => ["diaspora"],
+          "services"          => {
+            "inbound"  => [],
+            "outbound" => AppConfig.configured_services.map(&:to_s)
+          },
+          "openRegistrations" => AppConfig.settings.enable_registrations?,
+          "usage"             => {
+            "users" => {}
+          },
+          "metadata"          => {
+            "nodeName" => AppConfig.settings.pod_name,
+            "xmppChat" => AppConfig.chat.enabled?
+          }
+        )
+      end
+    end
   end
 end
diff --git a/vendor/nodeinfo/schemas/2.0.json b/vendor/nodeinfo/schemas/2.0.json
new file mode 100644
index 000000000..ddaca625e
--- /dev/null
+++ b/vendor/nodeinfo/schemas/2.0.json
@@ -0,0 +1,182 @@
+
+
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "id": "http://nodeinfo.diaspora.software/ns/schema/2.0#",
+  "description": "NodeInfo schema version 2.0.",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "version",
+    "software",
+    "protocols",
+    "services",
+    "openRegistrations",
+    "usage",
+    "metadata"
+  ],
+  "properties": {
+    "version": {
+      "description": "The schema version, must be 2.0.",
+      "enum": [
+        "2.0"
+      ]
+    },
+    "software": {
+      "description": "Metadata about server software in use.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "version"
+      ],
+      "properties": {
+        "name": {
+          "description": "The canonical name of this server software.",
+          "type": "string",
+          "pattern": "^[a-z0-9-]+$"
+        },
+        "version": {
+          "description": "The version of this server software.",
+          "type": "string"
+        }
+      }
+    },
+    "protocols": {
+      "description": "The protocols supported on this server.",
+      "type": "array",
+      "minItems": 1,
+      "items": {
+        "enum": [
+          "activitypub",
+          "buddycloud",
+          "dfrn",
+          "diaspora",
+          "libertree",
+          "ostatus",
+          "pumpio",
+          "tent",
+          "xmpp",
+          "zot"
+        ]
+      }
+    },
+    "services": {
+      "description": "The third party sites this server can connect to via their application API.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "inbound",
+        "outbound"
+      ],
+      "properties": {
+        "inbound": {
+          "description": "The third party sites this server can retrieve messages from for combined display with regular traffic.",
+          "type": "array",
+          "minItems": 0,
+          "items": {
+            "enum": [
+              "atom1.0",
+              "gnusocial",
+              "imap",
+              "pnut",
+              "pop3",
+              "pumpio",
+              "rss2.0",
+              "twitter"
+            ]
+          }
+        },
+        "outbound": {
+          "description": "The third party sites this server can publish messages to on the behalf of a user.",
+          "type": "array",
+          "minItems": 0,
+          "items": {
+            "enum": [
+              "atom1.0",
+              "blogger",
+              "buddycloud",
+              "diaspora",
+              "dreamwidth",
+              "drupal",
+              "facebook",
+              "friendica",
+              "gnusocial",
+              "google",
+              "insanejournal",
+              "libertree",
+              "linkedin",
+              "livejournal",
+              "mediagoblin",
+              "myspace",
+              "pinterest",
+              "pnut",
+              "posterous",
+              "pumpio",
+              "redmatrix",
+              "rss2.0",
+              "smtp",
+              "tent",
+              "tumblr",
+              "twitter",
+              "wordpress",
+              "xmpp"
+            ]
+          }
+        }
+      }
+    },
+    "openRegistrations": {
+      "description": "Whether this server allows open self-registration.",
+      "type": "boolean"
+    },
+    "usage": {
+      "description": "Usage statistics for this server.",
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "users"
+      ],
+      "properties": {
+        "users": {
+          "description": "statistics about the users of this server.",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "total": {
+              "description": "The total amount of on this server registered users.",
+              "type": "integer",
+              "minimum": 0
+            },
+            "activeHalfyear": {
+              "description": "The amount of users that signed in at least once in the last 180 days.",
+              "type": "integer",
+              "minimum": 0
+            },
+            "activeMonth": {
+              "description": "The amount of users that signed in at least once in the last 30 days.",
+              "type": "integer",
+              "minimum": 0
+            }
+          }
+        },
+        "localPosts": {
+          "description": "The amount of posts that were made by users that are registered on this server.",
+          "type": "integer",
+          "minimum": 0
+        },
+        "localComments": {
+          "description": "The amount of comments that were made by users that are registered on this server.",
+          "type": "integer",
+          "minimum": 0
+        }
+      }
+    },
+    "metadata": {
+      "description": "Free form key value pairs for software specific values. Clients should not rely on any specific key present.",
+      "type": "object",
+      "minProperties": 0,
+      "additionalProperties": true
+    }
+  }
+}