From 13698bece5a19ba078cbcba59bbe743064b3ef8a Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 5 Mar 2017 01:56:50 +0100
Subject: [PATCH 01/40] Start 0.6.5.0 cycle

---
 Changelog.md        | 8 ++++++++
 config/defaults.yml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index b360d79b8..6fc8fd91a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,11 @@
+# 0.6.5.0
+
+## Refactor
+
+## Bug fixes
+
+## Features
+
 # 0.6.4.0
 
 ## Refactor
diff --git a/config/defaults.yml b/config/defaults.yml
index ca3e4d5e6..7857a894b 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.6.3.99" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.6.4.99" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"

From e82005c517626f1cd8eafeceef560572c30eff02 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 5 Mar 2017 16:15:39 +0100
Subject: [PATCH 02/40] Disable Rails/HttpPositionalArguments cop

See http://rubocop.readthedocs.io/en/latest/cops_rails/#railshttppositionalarguments.

It only applies to Rails >= 5

closes #7353
---
 .rubocop.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index fae72b1a6..2ebb26cff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,6 +6,10 @@ AllCops:
 Rails:
   Enabled: true
 
+# Disable for rails 4
+Rails/HttpPositionalArguments:
+  Enabled: false
+
 # Commonly used screens these days easily fit more than 80 characters.
 Metrics/LineLength:
   Max: 120

From 0e28cfadb2ed63de6b571739bce2c850d78f3833 Mon Sep 17 00:00:00 2001
From: Senya <senya@riseup.net>
Date: Mon, 6 Mar 2017 19:12:31 +0200
Subject: [PATCH 03/40] remove unused setPreload function

closes #7354
---
 Changelog.md                      | 1 +
 app/assets/javascripts/app/app.js | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6fc8fd91a..7bea354f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 # 0.6.5.0
 
 ## Refactor
+* Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
 
 ## Bug fixes
 
diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js
index d95852882..57066f68d 100644
--- a/app/assets/javascripts/app/app.js
+++ b/app/assets/javascripts/app/app.js
@@ -60,11 +60,6 @@ var app = {
     return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead
   },
 
-  setPreload : function(prop, val) {
-    window.gon.preloads = window.gon.preloads || {};
-    window.gon.preloads[prop] = val;
-  },
-
   parsePreload : function(prop) {
       if(!app.hasPreload(prop)) { return; }
 

From a479db1c964ea3442fa6017f37c746903f5c9e1d Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Fri, 9 Dec 2016 21:08:38 +0200
Subject: [PATCH 04/40] a missing spy

---
 spec/javascripts/app/app_spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spec/javascripts/app/app_spec.js b/spec/javascripts/app/app_spec.js
index a1c987596..8a045ed78 100644
--- a/spec/javascripts/app/app_spec.js
+++ b/spec/javascripts/app/app_spec.js
@@ -4,6 +4,7 @@ describe("app", function() {
       spyOn(app.Router.prototype, "initialize");
       spyOn(app, "setupDummyPreloads");
       spyOn(app, "setupUser");
+      spyOn(app, "setupAspects");
       spyOn(app, "setupHeader");
       spyOn(app, "setupBackboneLinks");
       spyOn(app, "setupGlobalViews");
@@ -16,6 +17,7 @@ describe("app", function() {
       expect(app.Router.prototype.initialize).toHaveBeenCalled();
       expect(app.setupDummyPreloads).toHaveBeenCalled();
       expect(app.setupUser).toHaveBeenCalled();
+      expect(app.setupAspects).toHaveBeenCalled();
       expect(app.setupHeader).toHaveBeenCalled();
       expect(app.setupBackboneLinks).toHaveBeenCalled();
       expect(app.setupGlobalViews).toHaveBeenCalled();

From f36a4cd1f551b19e07bd1cae324a663dd3d62c9e Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sat, 10 Dec 2016 00:19:47 +0200
Subject: [PATCH 05/40] don't use the deprecated ".selector" method

---
 spec/javascripts/app/app_spec.js              |  9 ++++--
 .../javascripts/app/views/search_view_spec.js |  2 +-
 spec/javascripts/app/views_spec.js            | 29 ++++++++++++-------
 .../mobile/mobile_application_spec.js         |  2 +-
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/spec/javascripts/app/app_spec.js b/spec/javascripts/app/app_spec.js
index 8a045ed78..1ade3b556 100644
--- a/spec/javascripts/app/app_spec.js
+++ b/spec/javascripts/app/app_spec.js
@@ -41,18 +41,23 @@ describe("app", function() {
   });
 
   describe("setupForms", function() {
+    beforeEach(function() {
+      spec.content().append("<textarea/> <input/>");
+    });
+
     it("calls jQuery.placeholder() for inputs", function() {
       spyOn($.fn, "placeholder");
       app.setupForms();
       expect($.fn.placeholder).toHaveBeenCalled();
-      expect($.fn.placeholder.calls.mostRecent().object.selector).toBe("input, textarea");
+      expect($.fn.placeholder.calls.mostRecent().object.is($("input"))).toBe(true);
+      expect($.fn.placeholder.calls.mostRecent().object.is($("textarea"))).toBe(true);
     });
 
     it("initializes autosize for textareas", function(){
       spyOn(window, "autosize");
       app.setupForms();
       expect(window.autosize).toHaveBeenCalled();
-      expect(window.autosize.calls.mostRecent().args[0].selector).toBe("textarea");
+      expect(window.autosize.calls.mostRecent().args[0].is($("textarea"))).toBe(true);
     });
   });
 
diff --git a/spec/javascripts/app/views/search_view_spec.js b/spec/javascripts/app/views/search_view_spec.js
index ffb652304..fe93aa651 100644
--- a/spec/javascripts/app/views/search_view_spec.js
+++ b/spec/javascripts/app/views/search_view_spec.js
@@ -10,7 +10,7 @@ describe("app.views.Search", function() {
       spyOn(app.views.SearchBase.prototype, "initialize");
       this.view = new app.views.Search({el: "#search_people_form"});
       var call = app.views.SearchBase.prototype.initialize.calls.mostRecent();
-      expect(call.args[0].typeaheadInput.selector).toBe("#search_people_form #q");
+      expect(call.args[0].typeaheadInput.is($("#search_people_form #q"))).toBe(true);
       expect(call.args[0].remoteRoute).toEqual({url: "/search"});
     });
 
diff --git a/spec/javascripts/app/views_spec.js b/spec/javascripts/app/views_spec.js
index 6992f0372..84c912d15 100644
--- a/spec/javascripts/app/views_spec.js
+++ b/spec/javascripts/app/views_spec.js
@@ -119,42 +119,49 @@ describe("app.views.Base", function(){
 
     context("calling out to third party plugins", function() {
       it("replaces .time with relative time ago in words", function() {
+        this.view.templateName = false;
         spyOn($.fn, "timeago");
+        this.view.$el.append("<time/>");
         this.view.render();
         expect($.fn.timeago).toHaveBeenCalled();
-        expect($.fn.timeago.calls.mostRecent().object.selector).toBe("time");
+        expect($.fn.timeago.calls.mostRecent().object.first().is("time")).toBe(true);
       });
 
       it("initializes tooltips declared with the view's tooltipSelector property", function(){
+        this.view.templateName = false;
         this.view.tooltipSelector = ".christopher_columbus, .barrack_obama, .block_user";
+        this.view.$el.append("<div class='christopher_columbus barrack_obama block_user'/>");
 
         spyOn($.fn, "tooltip");
         this.view.render();
-        expect($.fn.tooltip.calls.mostRecent().object.selector).toBe(".christopher_columbus, .barrack_obama, .block_user");
-      });
-
-      it("applies infield labels", function(){
-        spyOn($.fn, "placeholder");
-        this.view.render();
-        expect($.fn.placeholder).toHaveBeenCalled();
-        expect($.fn.placeholder.calls.mostRecent().object.selector).toBe("input, textarea");
+        expect(
+          $.fn.tooltip.calls.mostRecent().object.is(".christopher_columbus, .barrack_obama, .block_user")
+        ).toBe(true);
       });
     });
   });
 
   describe("#renderTemplate", function(){
+    beforeEach(function() {
+      this.view.$el.htmlOriginal = this.view.$el.html;
+      spyOn(this.view.$el, "html").and.callFake(function() {
+        this.htmlOriginal("<input><textarea/></input>");
+        return this;
+      });
+    });
+
     it("calls jQuery.placeholder() for inputs", function() {
       spyOn($.fn, "placeholder");
       this.view.renderTemplate();
       expect($.fn.placeholder).toHaveBeenCalled();
-      expect($.fn.placeholder.calls.mostRecent().object.selector).toBe("input, textarea");
+      expect($.fn.placeholder.calls.mostRecent().object.is("input, textarea")).toBe(true);
     });
 
     it("initializes autosize for textareas", function(){
       spyOn(window, "autosize");
       this.view.renderTemplate();
       expect(window.autosize).toHaveBeenCalled();
-      expect(window.autosize.calls.mostRecent().args[0].selector).toBe("textarea");
+      expect(window.autosize.calls.mostRecent().args[0].is("textarea")).toBe(true);
     });
   });
 });
diff --git a/spec/javascripts/mobile/mobile_application_spec.js b/spec/javascripts/mobile/mobile_application_spec.js
index 3b6ecc4c9..c5a301551 100644
--- a/spec/javascripts/mobile/mobile_application_spec.js
+++ b/spec/javascripts/mobile/mobile_application_spec.js
@@ -8,7 +8,7 @@ describe("Diaspora.Mobile", function(){
     it("calls autosize for textareas", function(){
       Diaspora.Mobile.initialize();
       expect(window.autosize).toHaveBeenCalled();
-      expect(window.autosize.calls.mostRecent().args[0].selector).toBe("textarea");
+      expect(window.autosize.calls.mostRecent().args[0].is($("textarea"))).toBe(true);
     });
 
     it("deactivates shield", function(){

From 2739259fb63509e1ce29aec63c2e574167d1026d Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sun, 29 Jan 2017 04:40:39 +0200
Subject: [PATCH 06/40] some more replacements for deprecated jquery methods

closes #7356
---
 Changelog.md                                              | 1 +
 app/assets/javascripts/api/authorization_page.js          | 2 +-
 app/assets/javascripts/app/views.js                       | 2 +-
 app/assets/javascripts/app/views/contact_stream_view.js   | 2 +-
 .../javascripts/app/views/notification_dropdown_view.js   | 2 +-
 .../javascripts/app/views/publisher/uploader_view.js      | 2 +-
 app/assets/javascripts/app/views/publisher_view.js        | 2 +-
 app/assets/javascripts/app/views/tags_view.js             | 2 +-
 spec/javascripts/app/router_spec.js                       | 8 ++++++--
 spec/javascripts/app/views/publisher_mention_view_spec.js | 2 +-
 spec/javascripts/app/views/publisher_view_spec.js         | 3 ++-
 11 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7bea354f9..1d11ac178 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 ## Refactor
 * Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
+* Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
 
 ## Bug fixes
 
diff --git a/app/assets/javascripts/api/authorization_page.js b/app/assets/javascripts/api/authorization_page.js
index d61b941ec..84b0f31b8 100644
--- a/app/assets/javascripts/api/authorization_page.js
+++ b/app/assets/javascripts/api/authorization_page.js
@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $("#js-app-logo").error(function () {
+  $("#js-app-logo").on("error", function() {
     $(this).attr("src", ImagePaths.get("user/default.png"));
   });
 });
diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index ebd8901a9..d0bede4ea 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -56,7 +56,7 @@ app.views.Base = Backbone.View.extend({
       .attr("data-template", _.last(this.templateName.split("/")));
 
     // add avatar fallback if it can't be loaded
-    this.$el.find(this.avatars.selector).error(this.avatars.fallback);
+    this.$el.find(this.avatars.selector).on("error", this.avatars.fallback);
 
     // add placeholder support for old browsers
     this.$("input, textarea").placeholder();
diff --git a/app/assets/javascripts/app/views/contact_stream_view.js b/app/assets/javascripts/app/views/contact_stream_view.js
index cbc254c37..0fe60155e 100644
--- a/app/assets/javascripts/app/views/contact_stream_view.js
+++ b/app/assets/javascripts/app/views/contact_stream_view.js
@@ -18,7 +18,7 @@ app.views.ContactStream = Backbone.View.extend({
     $("#paginate .loader").removeClass("hidden");
     $.ajax(this._fetchUrl(), {
       context: this
-    }).success(function(response) {
+    }).done(function(response) {
       if (response.length === 0) {
         this.onEmptyResponse();
       } else {
diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js
index c3f8f1911..02c3a7137 100644
--- a/app/assets/javascripts/app/views/notification_dropdown_view.js
+++ b/app/assets/javascripts/app/views/notification_dropdown_view.js
@@ -96,7 +96,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
 
   afterNotificationChanges: function(node) {
     node.find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip();
-    node.find(this.avatars.selector).error(this.avatars.fallback);
+    node.find(this.avatars.selector).on("error", this.avatars.fallback);
   },
 
   finishLoading: function() {
diff --git a/app/assets/javascripts/app/views/publisher/uploader_view.js b/app/assets/javascripts/app/views/publisher/uploader_view.js
index 775cf69bb..841952112 100644
--- a/app/assets/javascripts/app/views/publisher/uploader_view.js
+++ b/app/assets/javascripts/app/views/publisher/uploader_view.js
@@ -149,7 +149,7 @@ app.views.PublisherUploader = Backbone.View.extend({
       dataType: "json",
       type: "DELETE",
       success: function() {
-        $.when(photo.fadeOut(400)).then(function(){
+        photo.fadeOut(400, function() {
           photo.remove();
 
           if( self.publisher.$(".publisher_photo").length === 0 ) {
diff --git a/app/assets/javascripts/app/views/publisher_view.js b/app/assets/javascripts/app/views/publisher_view.js
index de9245027..a80ef3555 100644
--- a/app/assets/javascripts/app/views/publisher_view.js
+++ b/app/assets/javascripts/app/views/publisher_view.js
@@ -44,7 +44,7 @@ app.views.Publisher = Backbone.View.extend({
     // if there is data in the publisher we ask for a confirmation
     // before the user is able to leave the page
     $(window).on("beforeunload", _.bind(this._beforeUnload, this));
-    $(window).unload(this.clear.bind(this));
+    $(window).on("unload", this.clear.bind(this));
 
     // sync textarea content
     if( this.hiddenInputEl.val() === "" ) {
diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js
index 9b70df1e6..3dda23c05 100644
--- a/app/assets/javascripts/app/views/tags_view.js
+++ b/app/assets/javascripts/app/views/tags_view.js
@@ -6,7 +6,7 @@ app.views.Tags = Backbone.View.extend({
       app.publisher.setText("#"+ opts.hashtagName + " ");
     }
     // add avatar fallback if it can't be loaded
-    $(app.views.Base.prototype.avatars.selector).error(app.views.Base.prototype.avatars.fallback);
+    $(app.views.Base.prototype.avatars.selector).on("error", app.views.Base.prototype.avatars.fallback);
   }
 });
 // @license-end
diff --git a/spec/javascripts/app/router_spec.js b/spec/javascripts/app/router_spec.js
index bafbe5568..c6ac8653d 100644
--- a/spec/javascripts/app/router_spec.js
+++ b/spec/javascripts/app/router_spec.js
@@ -123,14 +123,18 @@ describe('app.Router', function () {
   });
 
   describe("gettingStarted", function() {
+    beforeEach(function() {
+      spec.content().append($("<div id='hello-there'>"));
+    });
+
     it("renders app.pages.GettingStarted", function() {
       app.router.navigate("/getting_started", {trigger: true});
-      expect(app.page.$el.selector).toEqual("#hello-there");
+      expect(app.page.$el.is($("#hello-there"))).toBe(true);
     });
 
     it("renders app.pages.GettingStarted when the URL has a trailing slash", function() {
       app.router.navigate("/getting_started/", {trigger: true});
-      expect(app.page.$el.selector).toEqual("#hello-there");
+      expect(app.page.$el.is($("#hello-there"))).toBe(true);
     });
   });
 
diff --git a/spec/javascripts/app/views/publisher_mention_view_spec.js b/spec/javascripts/app/views/publisher_mention_view_spec.js
index d4e9417e3..7f5ced47c 100644
--- a/spec/javascripts/app/views/publisher_mention_view_spec.js
+++ b/spec/javascripts/app/views/publisher_mention_view_spec.js
@@ -16,7 +16,7 @@ describe("app.views.PublisherMention", function() {
       this.view = new app.views.PublisherMention({ el: "#publisher" });
       expect(app.views.SearchBase.prototype.initialize).toHaveBeenCalled();
       var call = app.views.SearchBase.prototype.initialize.calls.mostRecent();
-      expect(call.args[0].typeaheadInput.selector).toBe("#publisher .typeahead-mention-box");
+      expect(call.args[0].typeaheadInput.is($("#publisher .typeahead-mention-box"))).toBe(true);
       expect(call.args[0].customSearch).toBeTruthy();
       expect(call.args[0].autoselect).toBeTruthy();
       expect(call.args[0].remoteRoute).toEqual({url: "/contacts"});
diff --git a/spec/javascripts/app/views/publisher_view_spec.js b/spec/javascripts/app/views/publisher_view_spec.js
index c672b33fa..2e7c3b4dd 100644
--- a/spec/javascripts/app/views/publisher_view_spec.js
+++ b/spec/javascripts/app/views/publisher_view_spec.js
@@ -614,7 +614,7 @@ describe("app.views.Publisher", function() {
     });
 
     context('photo removal', function() {
-      beforeEach(function() {
+      beforeEach(function(done) {
         this.view = new app.views.Publisher();
         this.view.wrapperEl.addClass("with_attachments");
         this.view.photozoneEl.html(
@@ -626,6 +626,7 @@ describe("app.views.Publisher", function() {
         );
 
         spyOn(jQuery, 'ajax').and.callFake(function(opts) { opts.success(); });
+        this.view.viewUploader.on("change", done);
         this.view.photozoneEl.find(".x").click();
       });
 

From 526ebcfa13a799cae6bfbcc822c958ebecfa4d2b Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Mon, 30 Jan 2017 02:47:53 +0200
Subject: [PATCH 07/40] In jQuery 3 "#" is disallowed as a selector

here is a somewhat hacky way to force use an empty selector where "#"
was used as a selector before

closes #7372
---
 Changelog.md                                      | 1 +
 app/assets/javascripts/helpers/markdown_editor.js | 4 ++--
 app/assets/templates/header_tpl.jst.hbs           | 2 +-
 app/views/aspects/_no_contacts_message.haml       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1d11ac178..11f740608 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 ## Refactor
 * Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
 * Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
+* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 
 ## Bug fixes
 
diff --git a/app/assets/javascripts/helpers/markdown_editor.js b/app/assets/javascripts/helpers/markdown_editor.js
index 55df13480..5706888a1 100644
--- a/app/assets/javascripts/helpers/markdown_editor.js
+++ b/app/assets/javascripts/helpers/markdown_editor.js
@@ -65,7 +65,7 @@ Diaspora.MarkdownEditor.prototype = {
     var tabElement = $("<ul class='nav nav-tabs btn-group write-preview-tabs'></ul>");
 
     var writeTab = $("<li class='active full-height' role='presentation'></li>");
-    this.writeLink = $("<a class='full-height md-write-tab' href='#'></a>")
+    this.writeLink = $("<a class='full-height md-write-tab' href='#' data-target=' '></a>")
       .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.write"));
 
     this.writeLink.append($("<i class='visible-sm visible-xs visible-md diaspora-custom-compose'></i>"));
@@ -80,7 +80,7 @@ Diaspora.MarkdownEditor.prototype = {
     writeTab.append(this.writeLink);
 
     var previewTab = $("<li class='full-height' role='presentation'></li>");
-    this.previewLink = $("<a class='full-height md-preview-tab' href='#'></a>")
+    this.previewLink = $("<a class='full-height md-preview-tab' href='#' data-target=' '></a>")
       .attr("title", Diaspora.I18n.t("publisher.markdown_editor.tooltips.preview"));
 
     this.previewLink.append($("<i class='visible-sm visible-xs visible-md entypo-search'>"));
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index ab8a27a95..ee9eb0fb7 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -43,7 +43,7 @@
 
           <ul class="nav navbar-nav navbar-left nav-badges hidden-sm hidden-xs">
             <li class="dropdown" id="notification-dropdown">
-              <a id="notifications-link" href="/notifications" title="{{t "header.notifications"}}" class="notifications-link nav-badge hidden-sm hidden-xs" role="button" data-toggle="dropdown" aria-expanded="false" data-target="#">
+              <a id="notifications-link" href="/notifications" title="{{t "header.notifications"}}" class="notifications-link nav-badge hidden-sm hidden-xs" role="button" data-toggle="dropdown" aria-expanded="false" data-target=" ">
                 <i class="entypo-bell"></i>
                 <span class="badge badge-important {{#unless current_user.notifications_count}} hidden {{/unless}}">
                   {{current_user.notifications_count}}
diff --git a/app/views/aspects/_no_contacts_message.haml b/app/views/aspects/_no_contacts_message.haml
index 733db4135..95a493f9e 100644
--- a/app/views/aspects/_no_contacts_message.haml
+++ b/app/views/aspects/_no_contacts_message.haml
@@ -9,7 +9,7 @@
   %p
     != t(".try_adding_some_more_contacts",
          invite_link: link_to(t(".invite_link_text"),
-                                "#",
+                                " ",
                                 class: "invitations-link",
                                 data: {toggle: "modal"}))
 

From b3e3de08b829ea361089a2d7fc9fd02354f1af12 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Tue, 21 Mar 2017 00:38:08 +0100
Subject: [PATCH 08/40] Fix block user failing feature

closes #7379
---
 Changelog.md                                          | 1 +
 app/assets/javascripts/app/views/stream_post_views.js | 8 +++++---
 features/desktop/blocks_user.feature                  | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 11f740608..800f90c21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 
 ## Bug fixes
+* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
 
 ## Features
 
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index 31746783c..ee0968420 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -28,9 +28,11 @@ app.views.StreamPost = app.views.Post.extend({
                      ".permalink"].join(", "),
 
   initialize : function(){
-    var personId = this.model.get("author").id;
-    app.events.on("person:block:"+personId, this.remove, this);
-
+    // If we are on a user page, we don't want to remove posts on block
+    if (!app.page.model.has("profile")) {
+      var personId = this.model.get("author").id;
+      app.events.on("person:block:" + personId, this.remove, this);
+    }
     this.model.on("remove", this.remove, this);
     //subviews
     this.commentStreamView = new app.views.CommentStream({model : this.model});
diff --git a/features/desktop/blocks_user.feature b/features/desktop/blocks_user.feature
index d0beb8a8c..abf1063d0 100644
--- a/features/desktop/blocks_user.feature
+++ b/features/desktop/blocks_user.feature
@@ -18,6 +18,7 @@ Feature: Blocking a user from the stream
   Scenario: Blocking a user from the profile page
     When I am on "alice@alice.alice"'s page
     And I confirm the alert after I click on the profile block button
-    Then "All your base are belong to us!" should be post 1
+    Then I should see "Stop ignoring" within "#unblock_user_button"
+    And "All your base are belong to us!" should be post 1
     When I go to the home page
     Then I should not see any posts in my stream

From ad7d4d777b571b6a172fba91c071d72548d79b75 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Mon, 20 Mar 2017 21:07:57 +0100
Subject: [PATCH 09/40] Add links to liked and commented pages within My
 activity

closes #5502
---
 Changelog.md                                  |  1 +
 .../javascripts/app/views/stream_view.js      |  6 ++++++
 app/assets/stylesheets/navbar_left.scss       | 16 ++++++++++++----
 app/views/streams/main_stream.html.haml       | 12 +++++++++---
 config/locales/diaspora/en.yml                |  6 ++++++
 features/desktop/activity_stream.feature      | 19 +++++++++++++++++++
 6 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 800f90c21..ea35401f6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
 
 ## Features
+* Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
 
 # 0.6.4.0
 
diff --git a/app/assets/javascripts/app/views/stream_view.js b/app/assets/javascripts/app/views/stream_view.js
index 45e2091ff..687822595 100644
--- a/app/assets/javascripts/app/views/stream_view.js
+++ b/app/assets/javascripts/app/views/stream_view.js
@@ -28,6 +28,12 @@ app.views.Stream = app.views.InfScroll.extend({
     var streamSelection = $("#stream_selection");
     streamSelection.find("[data-stream]").removeClass("selected");
     streamSelection.find("[data-stream='" + activeStream + "']").addClass("selected");
+
+    var activityContainer = streamSelection.find(".my-activity");
+    activityContainer.removeClass("activity-stream-selected");
+    if (activeStream === "activity" || activeStream === "liked" || activeStream === "commented") {
+      activityContainer.addClass("activity-stream-selected");
+    }
   },
 
   initInvitationModal : function() {
diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss
index 56134c3bf..498b4fde5 100644
--- a/app/assets/stylesheets/navbar_left.scss
+++ b/app/assets/stylesheets/navbar_left.scss
@@ -30,16 +30,14 @@
     }
   }
 
-  .all-aspects .hoverable.selected,
-  .followed-tags-sidebar .hoverable.selected,
+  .nested-list .hoverable.selected,
   .selected > .hoverable {
     color: $white;
     background: $gray;
     border-color: $gray;
   }
 
-  .all-aspects ul,
-  .followed-tags-sidebar ul {
+  .nested-list ul {
     background: $left-navbar-drawer-background;
     li { padding: 0; }
     .entypo-check { visibility: hidden; }
@@ -59,6 +57,16 @@
     .hoverable:hover > .action { visibility: visible; }
   }
 
+  .my-activity {
+    ul {
+      display: none;
+    }
+
+    &.activity-stream-selected ul {
+      display: block;
+    }
+  }
+
   #tags_list {
     #new_tag_following {
       padding: 10px 20px 10px 30px;
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 8fe84aefe..da6c31f75 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -27,13 +27,19 @@
         %ul#stream_selection
           %li{data: {stream: "stream"}}
             = link_to t("streams.multi.title"), stream_path, rel: "backbone", class: "hoverable"
-          %li{data: {stream: "activity"}}
+          %li.nested-list.my-activity{data: {stream: "activity"}}
             = link_to t("streams.activity.title"), activity_stream_path, rel: "backbone", class: "hoverable"
+            %ul
+              %li{data: {stream: "liked"}}
+                = link_to t("streams.liked.title"), liked_stream_path, rel: "backbone", class: "hoverable selectable"
+              %li{data: {stream: "commented"}}
+                = link_to t("streams.commented.title"), commented_stream_path,
+                  rel: "backbone", class: "hoverable selectable"
           %li{data: {stream: "mentions"}}
             = link_to t("streams.mentions.title"), mentioned_stream_path, rel: "backbone", class: "hoverable"
-          %li.all-aspects
+          %li.nested-list.all-aspects
             = render "aspects/aspect_listings", stream: @stream
-          %li.followed-tags-sidebar
+          %li.nested-list
             = render "tags/followed_tags_listings"
           %li{data: {stream: "public"}}
             = link_to t("streams.public.title"), public_stream_path, rel: "backbone", class: "hoverable"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 065f7336c..e6bc47001 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1150,6 +1150,12 @@ en:
 
     activity:
       title: "My activity"
+
+    liked:
+      title: "Liked posts"
+
+    commented:
+      title: "Commented posts"
   users:
     edit:
       edit_account: "Edit account"
diff --git a/features/desktop/activity_stream.feature b/features/desktop/activity_stream.feature
index 7fb9e5277..f6a9d3746 100644
--- a/features/desktop/activity_stream.feature
+++ b/features/desktop/activity_stream.feature
@@ -15,12 +15,22 @@ Feature: The activity stream
     Then I should see "Look at this dog"
     And I should see "is that a poodle?"
 
+    When I go to the commented stream page
+    Then I should see "Look at this dog"
+    And I should see "is that a poodle?"
+
+    When I go to the liked stream page
+    Then I should not see "Look at this dog"
+
     When I am on "alice@alice.alice"'s page
     And I confirm the alert after I click to delete the first comment
 
     And I go to the activity stream page
     Then I should not see "Look at this dog"
 
+    When I go to the commented stream page
+    Then I should not see "Look at this dog"
+
   Scenario: unliking a post
     When I sign in as "bob@bob.bob"
     And I am on "alice@alice.alice"'s page
@@ -30,7 +40,16 @@ Feature: The activity stream
     And I go to the activity stream page
     Then I should see "Look at this dog"
 
+    When I go to the commented stream page
+    Then I should not see "Look at this dog"
+
+    When I go to the liked stream page
+    Then I should see "Look at this dog"
+
     When I am on "alice@alice.alice"'s page
     And I unlike the post "Look at this dog" in the stream
     And I go to the activity stream page
     Then I should not see "Look at this dog"
+
+    When I go to the liked stream page
+    Then I should not see "Look at this dog"

From 3ba84475f22240329844ccabb9094009fdb3931d Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Tue, 21 Mar 2017 14:00:33 +0100
Subject: [PATCH 10/40] Check for modal invitation title

closes #7381
---
 features/desktop/invitations.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature
index 0e9e09a61..683006b9b 100644
--- a/features/desktop/invitations.feature
+++ b/features/desktop/invitations.feature
@@ -52,6 +52,7 @@ Feature: Invitations
   Scenario: sends an invitation from the stream
     When I sign in as "alice@alice.alice"
     And I press the first "a.invitations-link" within "#no_contacts"
+    Then I should see "Invite someone to join diaspora*!" within "#invitationsModalLabel"
     And I fill in the following:
       | email_inviter_emails         | alex@example.com    |
     And I press "Send an invitation"

From bfad786ef5cfb6f116a62a2c3bba06f94507f04e Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Thu, 23 Mar 2017 03:28:46 +0100
Subject: [PATCH 11/40] Add Discourse, remove Loomio, remove mailinglists [ci
 skip]

closes #7387
---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c91fc94fe..ef9585d16 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@
 [Project site](https://diasporafoundation.org) |
 [Wiki](https://wiki.diasporafoundation.org) |
 [Bugtracker](https://github.com/diaspora/diaspora/issues) |
-[Discussions](https://www.loomio.org/groups/194) |
-[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) |
+[Discussions and Support](https://discourse.diasporafoundation.org/) |
 [License](/COPYRIGHT) |
 [Authors](https://github.com/diaspora/diaspora/contributors)
 
@@ -31,9 +30,9 @@ Still haven't found an answer? Talk to us! Read [how we communicate](https://wik
 
 ## Contribute
 
-To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
+To keep diaspora\* growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Discourse), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
 
-Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).
+Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, the wiki, and the Discourse is expected to follow the diaspora\* [code of conduct](/CODE_OF_CONDUCT.md).
 
 ## Security
 

From ce15f41a041fc739dd388a8fc92f42f3ace6cb03 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Thu, 23 Mar 2017 12:57:29 +0100
Subject: [PATCH 12/40] Check the publisher is closed when submitted, test it
 is expanded when filled

---
 features/desktop/signs_up.feature           | 10 +++++++---
 features/support/publishing_cuke_helpers.rb |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/features/desktop/signs_up.feature b/features/desktop/signs_up.feature
index 84b6381a3..55c124b86 100644
--- a/features/desktop/signs_up.feature
+++ b/features/desktop/signs_up.feature
@@ -13,8 +13,9 @@ Feature: new user registration
       | profile_first_name | O             |
     And I confirm the alert after I follow "awesome_button"
     Then I should be on the stream page
+    And the publisher should be expanded
     And I close the publisher
-    And I should not see "awesome_button"
+    Then I should not see "awesome_button"
     And I should not see any posts in my stream
 
   Scenario: new user tries to XSS itself
@@ -35,16 +36,18 @@ Feature: new user registration
   Scenario: new user skips the setup wizard
     When I confirm the alert after I follow "awesome_button"
     Then I should be on the stream page
-    And I close the publisher
+    And the publisher should be expanded
 
   Scenario: first status message is public
     When I confirm the alert after I follow "awesome_button"
     Then I should be on the stream page
+    And the publisher should be expanded
     And I should see "Public" within ".aspect_dropdown"
 
   Scenario: new user without any tags posts first status message
     When I confirm the alert after I follow "awesome_button"
     Then I should be on the stream page
+    And the publisher should be expanded
     When I submit the publisher
     Then "Hey everyone, I’m #newhere." should be post 1
 
@@ -55,7 +58,8 @@ Feature: new user registration
     And I press the first ".as-result-item" within "#as-results-tags"
     And I follow "awesome_button"
     Then I should be on the stream page
-    When I submit the publisher
+    And the publisher should be expanded
+    And I submit the publisher
     Then "Hey everyone, I’m #newhere. I’m interested in #rockstar." should be post 1
 
   Scenario: closing a popover clears getting started
diff --git a/features/support/publishing_cuke_helpers.rb b/features/support/publishing_cuke_helpers.rb
index 046f8e332..a3fc5c02e 100644
--- a/features/support/publishing_cuke_helpers.rb
+++ b/features/support/publishing_cuke_helpers.rb
@@ -35,6 +35,8 @@ module PublishingCukeHelpers
   def submit_publisher
     txt = find("#publisher #status_message_fake_text").value
     find("#publisher .btn-primary").click
+    # wait for the publisher to be closed
+    expect(find("#publisher")["class"]).to include("closed")
     # wait for the content to appear
     expect(find("#main_stream")).to have_content(txt)
   end

From 30c2d5d9ac7825e3a4c70a01418da4c3c0e80c34 Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Thu, 23 Mar 2017 12:58:08 +0100
Subject: [PATCH 13/40] Close popovers before submitting the publisher to avoid
 random failures

closes #7384
---
 features/desktop/signs_up.feature | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/features/desktop/signs_up.feature b/features/desktop/signs_up.feature
index 55c124b86..d68c58f19 100644
--- a/features/desktop/signs_up.feature
+++ b/features/desktop/signs_up.feature
@@ -48,7 +48,9 @@ Feature: new user registration
     When I confirm the alert after I follow "awesome_button"
     Then I should be on the stream page
     And the publisher should be expanded
-    When I submit the publisher
+    When I wait for the popovers to appear
+    And I click close on all the popovers
+    And I submit the publisher
     Then "Hey everyone, I’m #newhere." should be post 1
 
   Scenario: new user with some tags posts first status message
@@ -59,6 +61,8 @@ Feature: new user registration
     And I follow "awesome_button"
     Then I should be on the stream page
     And the publisher should be expanded
+    When I wait for the popovers to appear
+    And I click close on all the popovers
     And I submit the publisher
     Then "Hey everyone, I’m #newhere. I’m interested in #rockstar." should be post 1
 

From a639951b2039e977b860c722437077660f60e6f2 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 16 Mar 2017 15:26:47 +0100
Subject: [PATCH 14/40] Remove unused jquery.infinitescroll

closes #7370
---
 app/assets/javascripts/main.js                |   1 -
 .../jquery.infinitescroll-custom.js           | 621 ------------------
 2 files changed, 622 deletions(-)
 delete mode 100644 vendor/assets/javascripts/jquery.infinitescroll-custom.js

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 87f9d1cba..6acfa971d 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -11,7 +11,6 @@
 //= require jquery-placeholder
 //= require rails-timeago
 //= require jquery.events.input
-//= require jquery.infinitescroll-custom
 //= require jquery-ui/core
 //= require jquery-ui/widget
 //= require jquery-ui/mouse
diff --git a/vendor/assets/javascripts/jquery.infinitescroll-custom.js b/vendor/assets/javascripts/jquery.infinitescroll-custom.js
deleted file mode 100644
index d9f521892..000000000
--- a/vendor/assets/javascripts/jquery.infinitescroll-custom.js
+++ /dev/null
@@ -1,621 +0,0 @@
-/*!
-// Infinite Scroll jQuery plugin
-// copyright Paul Irish, licensed GPL & MIT
-// version 2.0b1.110420
-
-// home and docs: http://www.infinite-scroll.com
-// Modified by Diaspora:
-// A few callbacks were made options and generateInstanceID was make jquery 162 compatible
-*/
-
-; (function ($) {
-
-    /* Define 'infinitescroll' function
-    ---------------------------------------------------*/
-
-    $.fn.infinitescroll = function infscr(options, callback) {
-
-        // grab each selector option and see if any fail.
-        function areSelectorsValid(opts) {
-            var debug = $.fn.infinitescroll._debug;
-            for (var key in opts) {
-                if (key.indexOf && key.indexOf('Selector') > -1 && $(opts[key]).length === 0) {
-                    debug('Your ' + key + ' found no elements.');
-                    return false;
-                }
-                return true;
-            }
-        }
-
-
-        // find the number to increment in the path.
-        function determinePath(path) {
-
-        	if ($.isFunction(opts.pathParse)) {
-
-        		debug('pathParse');
-        		return [path];
-
-        	} else if (path.match(/^(.*?)\b2\b(.*?$)/)) {
-        		path = path.match(/^(.*?)\b2\b(.*?$)/).slice(1);
-
-        	// if there is any 2 in the url at all.
-        	} else if (path.match(/^(.*?)2(.*?$)/)) {
-
-	        	// page= is used in django:
-	        	// http://www.infinite-scroll.com/changelog/comment-page-1/#comment-127
-	        	if (path.match(/^(.*?page=)2(\/.*|$)/)) {
-	        		path = path.match(/^(.*?page=)2(\/.*|$)/).slice(1);
-	        		return path;
-	        	}
-
-	        	path = path.match(/^(.*?)2(.*?$)/).slice(1);
-
-	        } else {
-
-	        	// page= is used in drupal too but second page is page=1 not page=2:
-	        	// thx Jerod Fritz, vladikoff
-	        	if (path.match(/^(.*?page=)1(\/.*|$)/)) {
-	        		path = path.match(/^(.*?page=)1(\/.*|$)/).slice(1);
-	        		return path;
-	        	} else {
-	        		debug('Sorry, we couldn\'t parse your Next (Previous Posts) URL. Verify your the css selector points to the correct A tag. If you still get this error: yell, scream, and kindly ask for help at infinite-scroll.com.');
-	        		props.isInvalidPage = true;  //prevent it from running on this page.
-	        	}
-	        }
-	        debug('determinePath',path);
-	        return path;
-		}
-
-
-        // Calculate internal height (used for local scroll)
-        function hiddenHeight(element) {
-            var height = 0;
-            $(element).children().each(function () {
-                height = height + $(this).outerHeight(false);
-            });
-            return height;
-        }
-
-
-        //Generate InstanceID based on random data (to give consistent but different ID's)
-        function generateInstanceID(element) {
-            var $element = $(element)
-            var number = $element.length + $element.html().length
-            if($element.attr("class") !== undefined){
-              number += $element.attr("class").length
-            }
-            if($element.attr("id") !== undefined){
-              number += $element.attr("id").length
-            }
-            opts.infid = number;
-        }
-
-
-        // if options is a string, use as a command
-        if (typeof options=='string') {
-
-        	var command = options,
-        		argument = callback,
-        		validCommand = (command == 'pause' || command == 'destroy' || command == 'retrieve' || command == 'binding'),
-        		debug = $.fn.infinitescroll._debug;
-
-        	argument = argument || null;
-        	command = (validCommand) ? $.fn.infinitescroll[command](argument) : debug('Invalid command');
-
-        	return false;
-        }
-
-
-        // lets get started.
-        var opts = $.infinitescroll.opts = $.extend({}, $.infinitescroll.defaults, options),
-        	props = $.infinitescroll, // shorthand
-        	innerContainerHeight, box, frag, desturl, pause, error, errorStatus, method, result;
-        	callback = $.fn.infinitescroll._callback = callback || function () { },
-        	debug = $.fn.infinitescroll._debug,
-        	error = $.fn.infinitescroll._error,
-        	pause = $.fn.infinitescroll.pause,
-        	destroy = $.fn.infinitescroll.destroy,
-        	binding = $.fn.infinitescroll.binding;
-
-
-        // if selectors from opts aren't valid, return false
-        if (!areSelectorsValid(opts)) { return false; }
-
-
-        opts.container = opts.container || document.documentElement;
-
-
-        // contentSelector we'll use for our ajax call
-        opts.contentSelector = opts.contentSelector || this;
-
-        // Generate unique instance ID
-        opts.infid = (opts.infid == 0) ? generateInstanceID(opts.contentSelector) : opts.infid;
-
-        // loadMsgSelector - if we want to place the load message in a specific selector, defaulted to the contentSelector
-        opts.loadMsgSelector = opts.loadMsgSelector || opts.contentSelector;
-
-
-        // get the relative URL - everything past the domain name.
-        var relurl = /(.*?\/\/).*?(\/.*)/,
-        	path = $(opts.nextSelector).attr('href');
-
-        if (!path) { debug('Navigation selector not found'); return; }
-
-        // set the path to be a relative URL from root.
-        opts.path = determinePath(path);
-
-
-        // define loading msg
-        props.loadingMsg = $('<div id="infscr-loading" style="text-align: center;"><img alt="Loading..." src="' +
-
-                                  opts.loadingImg + '" /><div>' + opts.loadingText + '</div></div>');
-        // preload the image
-        (new Image()).src = opts.loadingImg;
-
-
-        //Check if its HTML (window scroll) and set innerContainerHeight
-        opts.binder = (opts.container.nodeName == "HTML") ? $(window) : $(opts.container);
-        innerContainerHeight = (opts.container.nodeName == "HTML") ? $(document).height() : innerContainerHeight = hiddenHeight(opts.container);
-        debug('Scrolling in: ',(opts.container.nodeName == "HTML") ? 'window' : opts.container);
-
-        // distance from nav links to bottom
-        // computed as: height of the document + top offset of container - top offset of nav link
-        opts.pixelsFromNavToBottom = innerContainerHeight +
-                                     (opts.container == document.documentElement ? 0 : $(opts.container).offset().top) -
-                                     $(opts.navSelector).offset().top;
-
-
-        // set up our bindings
-        // bind scroll handler to element (if its a local scroll) or window
-        binding('bind');
-        opts.binder.trigger('smartscroll.infscr.' + opts.infid); // trigger the event, in case it's a short page
-
-        return this;
-
-    }  // end of $.fn.infinitescroll()
-
-
-    /* Defaults and read-only properties object
-    ---------------------------------------------------*/
-
-    $.infinitescroll = {
-        defaults: {
-            debug: false,
-            binder: $(window),
-            preload: false,
-            nextSelector: "div.navigation a:first",
-            loadingImg: "http://www.infinite-scroll.com/loading.gif",
-            loadingText: "<em>Loading the next set of posts...</em>",
-            donetext: "<em>Congratulations, you've reached the end of the internet.</em>",
-            navSelector: "div.navigation",
-            contentSelector: null,           // not really a selector. :) it's whatever the method was called on..
-            loadMsgSelector: null,
-            loadingMsgRevealSpeed: 'fast', // controls how fast you want the loading message to come in, ex: 'fast', 'slow', 200 (milliseconds)
-            extraScrollPx: 150,
-            itemSelector: "div.post",
-            animate: false,
-            pathParse: undefined,
-            dataType: 'html',
-            appendCallback: true,
-            bufferPx: 40,
-            orientation: 'height',
-            errorCallback: function () { },
-            currPage: 1,
-            infid: 0, //Instance ID (Generated at setup)
-            isDuringAjax: false,
-            isInvalidPage: false,
-            isDestroyed: false,
-            isDone: false,  // for when it goes all the way through the archive.
-            isPaused: false,
-            container: undefined, //If left undefined uses window scroll, set as container for local scroll
-            pixelsFromNavToBottom: undefined,
-            path: undefined
-        },
-        loadingImg: undefined,
-        loadingMsg: undefined,
-        currDOMChunk: null  // defined in setup()'s load()
-    };
-
-
-    /* Methods + Commands
-    ---------------------------------------------------*/
-
-    // Console log wrapper.
-    $.fn.infinitescroll._debug = function infscr_debug() {
-        if ($.infinitescroll.opts.debug) {
-        	return window.console && console.log.call(console, arguments);
-        }
-    }
-
-
-    // shortcut function for...getting shortcuts
-    $.fn.infinitescroll._shorthand = function infscr_shorthand() {
-
-    	// someone should write this, and it would rule
-
-    };
-
-
-    // Near Bottom (isNearBottom)
-    $.fn.infinitescroll._nearbottom = function infscr_nearbottom() {
-
-        // replace with shorthand function
-        var opts = $.infinitescroll.opts,
-        	debug = $.fn.infinitescroll._debug,
-        	hiddenHeight = $.fn.infinitescroll._hiddenheight;
-
-        // distance remaining in the scroll
-        // computed as: document height - distance already scroll - viewport height - buffer
-
-        if (opts.container.nodeName == "HTML") {
-            var pixelsFromWindowBottomToBottom = 0
-            + $(document).height()
-            // have to do this bs because safari doesnt report a scrollTop on the html element
-            - ($(opts.container).scrollTop() || $(opts.container.ownerDocument.body).scrollTop())
-            - $(window).height();
-        }
-        else {
-            var pixelsFromWindowBottomToBottom = 0
-            + hiddenHeight(opts.container) - $(opts.container).scrollTop() - $(opts.container).height();
-
-        }
-
-        debug('math:', pixelsFromWindowBottomToBottom, opts.pixelsFromNavToBottom);
-
-        // if distance remaining in the scroll (including buffer) is less than the orignal nav to bottom....
-        return (pixelsFromWindowBottomToBottom - opts.bufferPx < opts.pixelsFromNavToBottom);
-
-    }
-
-
-    // Setup function (infscrSetup)
-    $.fn.infinitescroll._setup = function infscr_setup() {
-
-    	// replace with shorthand function
-    	var props = $.infinitescroll,
-    		opts = $.infinitescroll.opts,
-    		isNearBottom = $.fn.infinitescroll._nearbottom,
-    		kickOffAjax = $.fn.infinitescroll.retrieve;
-
-    	if (opts.isDuringAjax || opts.isInvalidPage || opts.isDone || opts.isDestroyed || opts.isPaused) return;
-
-    	if (!isNearBottom(opts, props)) return;
-
-    	kickOffAjax();
-
-    };
-
-
-    // Ajax function (kickOffAjax)
-    $.fn.infinitescroll.retrieve = function infscr_retrieve() {
-
-    	// replace with shorthand function
-    	var props = $.infinitescroll,
-    		opts = props.opts,
-    		debug = $.fn.infinitescroll._debug,
-    		loadCallback = $.fn.infinitescroll._loadcallback,
-    		error = $.fn.infinitescroll._error,
-    		path = opts.path, // get this
-    		box, frag, desturl, method, condition;
-
-
-    	// we dont want to fire the ajax multiple times
-        opts.isDuringAjax = true;
-
-
-        // show the loading message quickly
-        // then hide the previous/next links after we're
-        // sure the loading message was visible
-        props.loadingMsg.appendTo(opts.loadMsgSelector).show();
-
-          $(opts.navSelector).hide();
-
-          // increment the URL bit. e.g. /page/3/
-          opts.currPage++;
-
-          debug('heading into ajax', path);
-
-          // if we're dealing with a table we can't use DIVs
-          box = $(opts.contentSelector).is('table') ? $('<tbody/>') : $('<div/>');
-
-
-          // INSERT DEBUG ERROR FOR invalid desturl
-          desturl = ($.isFunction(opts.pathParse)) ? opts.pathParse(path.join('2'), opts.currPage) : desturl = path.join(opts.currPage);
-          // desturl = path.join(opts.currPage);
-
-          // create switch parameter for append / callback
-          // MAKE SURE CALLBACK EXISTS???
-          method = (opts.dataType == 'html' || opts.dataType == 'json') ? opts.dataType : 'html+callback';
-          if (opts.appendCallback && opts.dataType == 'html') method += '+callback';
-
-          switch (method) {
-
-            case 'html+callback':
-
-              debug('Using HTML via .load() method');
-              box.load(desturl + ' ' + opts.itemSelector, null, function(jqXHR,textStatus) {
-                loadCallback(box,jqXHR.responseText);
-              });
-
-            break;
-
-            case 'html':
-            case 'json':
-
-              debug('Using '+(method.toUpperCase())+' via $.ajax() method');
-              $.ajax({
-                // params
-                url: desturl,
-                dataType: opts.dataType,
-                complete: function _infscrAjax(jqXHR,textStatus) {
-                  condition = (typeof(jqXHR.isResolved) !== 'undefined') ? (jqXHR.isResolved()) : (textStatus === "success" || textStatus === "notmodified");
-                  (condition) ? loadCallback(box,jqXHR.responseText) : error([404]);
-                }
-              });
-
-            break;
-
-          }
-    };
-
-
-    // Load callback
-    $.fn.infinitescroll._loadcallback = function infscr_loadcallback(box,data) {
-
-    	// replace with shorthand function
-    	var props = $.infinitescroll,
-    		opts = $.infinitescroll.opts,
-    		error = $.fn.infinitescroll._error,
-    		showDoneMsg = $.fn.infinitescroll._donemsg,
-    		callback = $.fn.infinitescroll._callback, // GLOBAL OBJECT FOR CALLBACK
-    		result, frag;
-
-    	result = (opts.isDone) ? 'done' : (!opts.appendCallback) ? 'no-append' : 'append';
-
-        switch (result) {
-
-        	case 'done':
-
-            	showDoneMsg();
-                return false;
-
-            break;
-
-            case 'no-append':
-
-            	if (opts.dataType == 'html') {
-            		data = '<div>'+data+'</div>';
-            		data = $(data).find(opts.itemSelector);
-            	};
-
-            break;
-
-            case 'append':
-
-            	var children = box.children();
-
-            	// if it didn't return anything
-                if (children.length == 0 || children.hasClass('error404')) {
-                    // trigger a 404 error so we can quit.
-                    return error([404]);
-                }
-
-
-                // use a documentFragment because it works when content is going into a table or UL
-                frag = document.createDocumentFragment();
-                while (box[0].firstChild) {
-                    frag.appendChild(box[0].firstChild);
-                }
-
-                $(opts.contentSelector)[0].appendChild(frag);
-                // previously, we would pass in the new DOM element as context for the callback
-                // however we're now using a documentfragment, which doesnt havent parents or children,
-                // so the context is the contentContainer guy, and we pass in an array
-                //   of the elements collected as the first argument.
-
-                data = children.get();
-
-
-            break;
-
-        }
-
-        // fadeout currently makes the <em>'d text ugly in IE6
-        props.loadingMsg.hide();
-
-
-        // smooth scroll to ease in the new content
-        if (opts.animate) {
-            var scrollTo = $(window).scrollTop() + $('#infscr-loading').height() + opts.extraScrollPx + 'px';
-            $('html,body').animate({ scrollTop: scrollTo }, 800, function () { opts.isDuringAjax = false; });
-        }
-
-        if (!opts.animate) opts.isDuringAjax = false; // once the call is done, we can allow it again.
-
-        callback.call($(opts.contentSelector)[0], data);
-
-    };
-
-
-    // Show done message.
-    $.fn.infinitescroll._donemsg = function infscr_donemsg() {
-
-    	// replace with shorthand function
-    	var props = $.infinitescroll,
-    		opts = $.infinitescroll.opts;
-
-    	props.loadingMsg
-    		.find('img')
-    		.hide()
-    		.parent()
-    		.find('div').html(opts.donetext).animate({ opacity: 1 }, 2000, function () {
-	    		$(this).parent().fadeOut('normal');
-	    	});
-
-        // user provided callback when done
-        opts.errorCallback();
-    }
-
-
-    // Pause function
-    $.fn.infinitescroll.pause = function infscr_pause(pause) {
-
-        // if pauseValue is not 'pause' or 'resume', toggle it's value
-        var debug = $.fn.infinitescroll._debug,
-        	opts = $.infinitescroll.opts;
-
-        if (pause !== 'pause' && pause !== 'resume' && pause !== 'toggle' && pause !== null) {
-        	debug('Invalid argument. Toggling pause value instead');
-        };
-
-        pause = (pause && (pause == 'pause' || pause == 'resume')) ? pause : 'toggle';
-
-        switch (pause) {
-            case 'pause':
-                opts.isPaused = true;
-            break;
-
-            case 'resume':
-                opts.isPaused = false;
-            break;
-
-            case 'toggle':
-                opts.isPaused = !opts.isPaused;
-            break;
-        }
-
-        debug('Paused',opts.isPaused);
-        return false;
-    }
-
-
-    // Error function
-    $.fn.infinitescroll._error = function infscr_error(xhr) {
-
-        // replace with shorthand function
-        var opts = $.infinitescroll.opts,
-        	binder = (opts.container.nodeName == "HTML") ? $(window) : $(opts.container),
-        	debug = $.fn.infinitescroll._debug,
-        	showDoneMsg = $.fn.infinitescroll._donemsg,
-        	error = (!opts.isDone && xhr == 404) ? 'end' : (opts.isDestroyed && xhr == 302) ? 'destroy' : 'unknown';
-
-        switch (error) {
-
-        	case 'end':
-
-        		// die if we're out of pages.
-                debug('Page not found. Self-destructing...');
-                showDoneMsg();
-                opts.isDone = true;
-                opts.currPage = 1; // if you need to go back to this instance
-                opts.isPaused = false;
-                binder.unbind('smartscroll.infscr.' + opts.infid);
-
-        	break;
-
-        	case 'destroy':
-
-        		// die if destroyed.
-                debug('Destroyed. Going to next instance...');
-                opts.isDone = true;
-                opts.currPage = 1; // if you need to go back to this instance
-                opts.isPaused = false;
-                binder.unbind('smartscroll.infscr.' + opts.infid);
-
-        	break;
-
-        	case 'unknown':
-
-        		// unknown error.
-                debug('Unknown Error. WHAT DID YOU DO?!...');
-                showDoneMsg();
-                opts.isDone = true;
-                opts.currPage = 1; // if you need to go back to this instance
-                binder.unbind('smartscroll.infscr.' + opts.infid);
-
-        	break;
-
-        }
-
-    }
-
-
-    // Destroy current instance of the plugin
-    $.fn.infinitescroll.destroy = function infscr_destroy() {
-
-        // replace with shorthand function
-        var opts = $.infinitescroll.opts,
-        	error = $.fn.infinitescroll._error;
-
-        opts.isDestroyed = true;
-        return error([302]);
-
-    }
-
-
-    // Scroll binding + unbinding
-    $.fn.infinitescroll.binding = function infscr_binding(binding) {
-
-        // replace with shorthand function
-        var opts = $.infinitescroll.opts,
-        	setup = $.fn.infinitescroll._setup,
-        	error = $.fn.infinitescroll._error,
-        	debug = $.fn.infinitescroll._debug;
-
-        switch(binding) {
-
-        	case 'bind':
-        		opts.binder.bind('smartscroll.infscr.'+opts.infid, setup);
-        	break;
-
-        	case 'unbind':
-        		opts.binder.unbind('smartscroll.infscr.'+opts.infid);
-        	break;
-
-        }
-
-        debug('Binding',binding);
-        return false;
-
-    }
-
-
-    /*
-	* smartscroll: debounced scroll event for jQuery *
-	* https://github.com/lukeshumard/smartscroll
-	* Based on smartresize by @louis_remi: https://github.com/lrbabe/jquery.smartresize.js *
-	* Copyright 2011 Louis-Remi & Luke Shumard * Licensed under the MIT license. *
-	*/
-
-	var event = $.event,
-		scrollTimeout;
-
-	event.special.smartscroll = {
-		setup: function() {
-		  $(this).bind( "scroll", event.special.smartscroll.handler );
-		},
-		teardown: function() {
-		  $(this).unbind( "scroll", event.special.smartscroll.handler );
-		},
-		handler: function( event, execAsap ) {
-		  // Save the context
-		  var context = this,
-		      args = arguments;
-
-		  // set correct event type
-		  event.type = "smartscroll";
-
-		  if (scrollTimeout) { clearTimeout(scrollTimeout); }
-		  scrollTimeout = setTimeout(function() {
-		    jQuery.event.dispatch.apply( context, args );
-		  }, execAsap === "execAsap"? 0 : 100);
-		}
-	};
-
-	$.fn.smartscroll = function( fn ) {
-		return fn ? this.bind( "smartscroll", fn ) : this.trigger( "smartscroll", ["execAsap"] );
-	};
-
-
-})(jQuery);

From d3de97b244b0b09b7dc9a753c9c17b45793d56bb Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 18:58:20 +0100
Subject: [PATCH 15/40] Disable autocomplete for the conversation form
 recipient input

closes #7375
---
 Changelog.md                      | 1 +
 app/views/conversations/_new.haml | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ea35401f6..85e7e0845 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
+* Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/views/conversations/_new.haml b/app/views/conversations/_new.haml
index c84a6b95a..17eaed4af 100644
--- a/app/views/conversations/_new.haml
+++ b/app/views/conversations/_new.haml
@@ -4,7 +4,12 @@
     .form-group
       %label#to-label{for: "contacts-search-input"}= t(".to")
       .recipients-tag-list.clearfix#recipients-tag-list
-      = text_field_tag "contact_autocomplete", nil, id: "contacts-search-input", class: "form-control"
+      = text_field_tag "contact_autocomplete",
+                       nil,
+                       id: "contacts-search-input",
+                       class: "form-control",
+                       autocomplete: "off"
+
       - unless defined?(mobile) && mobile
         = text_field_tag "person_ids", nil, id: "contact-ids", type: "hidden",
                                             aria: {labelledby: "to-label"}

From 05e9798027dc376ec357ef3baa72b24670172b80 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Tue, 21 Mar 2017 16:22:23 +0100
Subject: [PATCH 16/40] Fix sharing indicator on profile page for blocked users

closes #7382
---
 Changelog.md                                |  1 +
 app/assets/javascripts/app/models/person.js |  2 +-
 app/presenters/person_presenter.rb          |  1 -
 spec/javascripts/app/models/person_spec.js  |  4 ++--
 spec/javascripts/jasmine_helpers/factory.js |  1 +
 spec/presenters/person_presenter_spec.rb    | 19 +++++++++++++------
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 85e7e0845..8fb0c37ce 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
 * Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
+* Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/assets/javascripts/app/models/person.js b/app/assets/javascripts/app/models/person.js
index 4d70fada4..0f548798b 100644
--- a/app/assets/javascripts/app/models/person.js
+++ b/app/assets/javascripts/app/models/person.js
@@ -30,7 +30,7 @@ app.models.Person = Backbone.Model.extend({
   },
 
   isBlocked: function() {
-    return (this.get('relationship') === 'blocked');
+    return (this.get("block") !== false);
   },
 
   block: function() {
diff --git a/app/presenters/person_presenter.rb b/app/presenters/person_presenter.rb
index 63685cb51..d9cf71c02 100644
--- a/app/presenters/person_presenter.rb
+++ b/app/presenters/person_presenter.rb
@@ -48,7 +48,6 @@ class PersonPresenter < BasePresenter
 
   def relationship
     return false unless current_user
-    return :blocked if is_blocked?
 
     contact = current_user_person_contact
     return :not_sharing unless contact
diff --git a/spec/javascripts/app/models/person_spec.js b/spec/javascripts/app/models/person_spec.js
index d84afdd8f..c4b873832 100644
--- a/spec/javascripts/app/models/person_spec.js
+++ b/spec/javascripts/app/models/person_spec.js
@@ -4,7 +4,7 @@ describe("app.models.Person", function() {
     this.mutualContact = factory.person({relationship: "mutual"});
     this.sharingContact = factory.person({relationship: "sharing"});
     this.receivingContact = factory.person({relationship: "receiving"});
-    this.blockedContact = factory.person({relationship: "blocked", block: {id: 1}});
+    this.blockedContact = factory.person({relationship: "sharing", block: {id: 1}});
   });
 
   describe("initialize", function() {
@@ -20,9 +20,9 @@ describe("app.models.Person", function() {
     it("indicates if the person is sharing", function() {
       expect(this.mutualContact.isSharing()).toBeTruthy();
       expect(this.sharingContact.isSharing()).toBeTruthy();
+      expect(this.blockedContact.isSharing()).toBeTruthy();
 
       expect(this.receivingContact.isSharing()).toBeFalsy();
-      expect(this.blockedContact.isSharing()).toBeFalsy();
     });
   });
 
diff --git a/spec/javascripts/jasmine_helpers/factory.js b/spec/javascripts/jasmine_helpers/factory.js
index 7732e8281..551fe87bc 100644
--- a/spec/javascripts/jasmine_helpers/factory.js
+++ b/spec/javascripts/jasmine_helpers/factory.js
@@ -153,6 +153,7 @@ var factory = {
       "name": "Bob Grimm",
       "diaspora_id": "bob@localhost:3000",
       "relationship": "sharing",
+      "block": false,
       "is_own_profile": false
     };
     return _.extend({}, defaults, overrides);
diff --git a/spec/presenters/person_presenter_spec.rb b/spec/presenters/person_presenter_spec.rb
index e6c224674..c21965f9b 100644
--- a/spec/presenters/person_presenter_spec.rb
+++ b/spec/presenters/person_presenter_spec.rb
@@ -92,12 +92,6 @@ describe PersonPresenter do
     end
 
     context "relationship" do
-      it "is blocked?" do
-        allow(current_user).to receive(:block_for) { double(id: 1) }
-        allow(current_user).to receive(:contact_for) { non_contact }
-        expect(@p.full_hash[:relationship]).to be(:blocked)
-      end
-
       it "is mutual?" do
         allow(current_user).to receive(:contact_for) { mutual_contact }
         expect(@p.full_hash[:relationship]).to be(:mutual)
@@ -118,6 +112,19 @@ describe PersonPresenter do
         expect(@p.full_hash[:relationship]).to be(:not_sharing)
       end
     end
+
+    describe "block" do
+      it "contains the block id if it exists" do
+        allow(current_user).to receive(:contact_for) { non_contact }
+        allow(current_user).to receive(:block_for) { double(id: 1) }
+        expect(@p.full_hash[:block][:id]).to be(1)
+      end
+
+      it "is false if no block is present" do
+        allow(current_user).to receive(:contact_for) { non_contact }
+        expect(@p.full_hash[:block]).to be(false)
+      end
+    end
   end
 
   describe "#hovercard" do

From 57b7debdb684a62c95009664af397d5b2f6756b6 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Tue, 14 Mar 2017 11:00:58 +0100
Subject: [PATCH 17/40] Refactor location stream view, remove unused function

closes #7364
---
 app/assets/javascripts/app/views/content_view.js    | 6 ------
 app/assets/javascripts/app/views/location_stream.js | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/assets/javascripts/app/views/content_view.js b/app/assets/javascripts/app/views/content_view.js
index 485fca01c..7027ea97c 100644
--- a/app/assets/javascripts/app/views/content_view.js
+++ b/app/assets/javascripts/app/views/content_view.js
@@ -10,7 +10,6 @@ app.views.Content = app.views.Base.extend({
       text : app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people")),
       largePhoto : this.largePhoto(),
       smallPhotos : this.smallPhotos(),
-      location: this.location(),
       isReshare : this.model.get("post_type") === "Reshare"
     });
   },
@@ -38,11 +37,6 @@ app.views.Content = app.views.Base.extend({
     $(evt.currentTarget).hide();
   },
 
-  location: function(){
-    var location = this.model.get("location")? this.model.get("location") : "";
-    return location;
-  },
-
   collapseOversized : function() {
     var collHeight = 200
       , elem = this.$(".collapsible")
diff --git a/app/assets/javascripts/app/views/location_stream.js b/app/assets/javascripts/app/views/location_stream.js
index 925ee1f2f..8b3238c30 100644
--- a/app/assets/javascripts/app/views/location_stream.js
+++ b/app/assets/javascripts/app/views/location_stream.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
-app.views.LocationStream = app.views.Content.extend({
+app.views.LocationStream = app.views.Base.extend({
   events: {
     "click .near-from": "toggleMap"
   },

From aa55a7a023ea1e96d699a3e4140b5be35049f3f5 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Fri, 17 Mar 2017 14:03:34 +0100
Subject: [PATCH 18/40] Remove custom jquery input event

closes #7371
---
 app/assets/javascripts/main.js                |   1 -
 .../assets/javascripts/jquery.events.input.js | 132 ------------------
 2 files changed, 133 deletions(-)
 delete mode 100644 vendor/assets/javascripts/jquery.events.input.js

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 6acfa971d..e8840b6dc 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -10,7 +10,6 @@
 //= require charcount
 //= require jquery-placeholder
 //= require rails-timeago
-//= require jquery.events.input
 //= require jquery-ui/core
 //= require jquery-ui/widget
 //= require jquery-ui/mouse
diff --git a/vendor/assets/javascripts/jquery.events.input.js b/vendor/assets/javascripts/jquery.events.input.js
deleted file mode 100644
index 9b2bbbfb3..000000000
--- a/vendor/assets/javascripts/jquery.events.input.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    jQuery `input` special event v1.0
-
-    http://whattheheadsaid.com/projects/input-special-event
-
-    (c) 2010-2011 Andy Earnshaw
-    MIT license
-    www.opensource.org/licenses/mit-license.php
-
-    Modified by Kenneth Auchenberg
-    * Disabled usage of onPropertyChange event in IE, since its a bit delayed, if you type really fast.
-*/
-
-(function($) {
-  // Handler for propertychange events only
-  function propHandler() {
-    var $this = $(this);
-    if (window.event.propertyName == "value" && !$this.data("triggering.inputEvent")) {
-      $this.data("triggering.inputEvent", true).trigger("input");
-      window.setTimeout(function () {
-        $this.data("triggering.inputEvent", false);
-      }, 0);
-    }
-  }
-
-  $.event.special.input = {
-    setup: function(data, namespaces) {
-      var timer,
-        // Get a reference to the element
-        elem = this,
-        // Store the current state of the element
-        state = elem.value,
-        // Create a dummy element that we can use for testing event support
-        tester = document.createElement(this.tagName),
-        // Check for native oninput
-        oninput = "oninput" in tester || checkEvent(tester),
-        // Check for onpropertychange
-        onprop = "onpropertychange" in tester,
-        // Generate a random namespace for event bindings
-        ns = "inputEventNS" + ~~(Math.random() * 10000000),
-        // Last resort event names
-        evts = ["focus", "blur", "paste", "cut", "keydown", "drop", ""].join("." + ns + " ");
-
-      function checkState() {
-        var $this = $(elem);
-        if (elem.value != state && !$this.data("triggering.inputEvent")) {
-          state = elem.value;
-
-          $this.data("triggering.inputEvent", true).trigger("input");
-          window.setTimeout(function () {
-            $this.data("triggering.inputEvent", false);
-          }, 0);
-        }
-      }
-
-      // Set up a function to handle the different events that may fire
-      function handler(e) {
-        // When focusing, set a timer that polls for changes to the value
-        if (e.type == "focus") {
-          checkState();
-          clearInterval(timer);
-          timer = window.setInterval(checkState, 250);
-        } else if (e.type == "blur") {
-          // When blurring, cancel the aforeset timer
-          window.clearInterval(timer);
-        } else {
-          // For all other events, queue a timer to check state ASAP
-          window.setTimeout(checkState, 0);
-        }
-      }
-
-      // Bind to native event if available
-      if (oninput) {
-        return false;
-//      } else if (onprop) {
-//        // Else fall back to propertychange if available
-//        $(this).find("input, textarea").andSelf().filter("input, textarea").bind("propertychange." + ns, propHandler);
-      } else {
-        // Else clutch at straws!
-        $(this).find("input, textarea").andSelf().filter("input, textarea").bind(evts, handler);
-      }
-      $(this).data("inputEventHandlerNS", ns);
-    },
-    teardown: function () {
-      var elem = $(this);
-      elem.find("input, textarea").unbind(elem.data("inputEventHandlerNS"));
-      elem.data("inputEventHandlerNS", "");
-    }
-  };
-
-  // Setup our jQuery shorthand method
-  $.fn.input = function (handler) {
-    return handler ? this.bind("input", handler) : this.trigger("input");
-  };
-
-  /*
-   The following function tests the element for oninput support in Firefox.  Many thanks to
-   http://blog.danielfriesen.name/2010/02/16/html5-browser-maze-oninput-support/
-   */
-  function checkEvent(el) {
-    // First check, for if Firefox fixes its issue with el.oninput = function
-    el.setAttribute("oninput", "return");
-    if (typeof el.oninput == "function") {
-      return true;
-    }
-    // Second check, because Firefox doesn't map oninput attribute to oninput property
-    try {
-
-      // "* Note * : Disabled focus and dispatch of keypress event due to conflict with DOMready, which resulted in scrolling down to the bottom of the page, possibly because layout wasn't finished rendering.
-      var e = document.createEvent("KeyboardEvent"),
-        ok = false,
-        tester = function(e) {
-          ok = true;
-          e.preventDefault();
-          e.stopPropagation();
-      };
-
-      // e.initKeyEvent("keypress", true, true, window, false, false, false, false, 0, "e".charCodeAt(0));
-
-      document.body.appendChild(el);
-      el.addEventListener("input", tester, false);
-      // el.focus();
-      // el.dispatchEvent(e);
-      el.removeEventListener("input", tester, false);
-      document.body.removeChild(el);
-      return ok;
-
-    } catch(error) {
-
-    }
-  }
-})(jQuery);
\ No newline at end of file

From 3ce4bba3831dcbcb1ed683c93c25025d7e660e65 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 23 Mar 2017 00:58:56 +0100
Subject: [PATCH 19/40] Only remove post from stream after successful response

Pass destroyModel from post control view to post view
and don't listen to the remove event in the post view
anymore. The `remove` function will be called from the
base view.

Fixes #5445
---
 app/assets/javascripts/app/views/post_controls_view.js | 4 ++++
 app/assets/javascripts/app/views/stream_post_views.js  | 1 -
 app/assets/stylesheets/stream_element.scss             | 3 ++-
 spec/javascripts/app/views/post_controls_view_spec.js  | 7 +++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/views/post_controls_view.js b/app/assets/javascripts/app/views/post_controls_view.js
index 78c0ee3df..879d4d623 100644
--- a/app/assets/javascripts/app/views/post_controls_view.js
+++ b/app/assets/javascripts/app/views/post_controls_view.js
@@ -76,6 +76,10 @@ app.views.PostControls = app.views.Base.extend({
     $.post(Routes.postParticipation(this.model.get("id")), {_method: "delete"}, function() {
       this.model.set({participation: false});
     }.bind(this));
+  },
+
+  destroyModel: function() {
+    this.post.destroyModel();
   }
 });
 // @license-end
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index ee0968420..c723d514b 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -33,7 +33,6 @@ app.views.StreamPost = app.views.Post.extend({
       var personId = this.model.get("author").id;
       app.events.on("person:block:" + personId, this.remove, this);
     }
-    this.model.on("remove", this.remove, this);
     //subviews
     this.commentStreamView = new app.views.CommentStream({model : this.model});
     this.oEmbedView = new app.views.OEmbed({model : this.model});
diff --git a/app/assets/stylesheets/stream_element.scss b/app/assets/stylesheets/stream_element.scss
index 0cf1c6067..2ef09f3e0 100644
--- a/app/assets/stylesheets/stream_element.scss
+++ b/app/assets/stylesheets/stream_element.scss
@@ -4,7 +4,8 @@
     margin: 0px;
   }
   &.deleting {
-    > .media { opacity: 0.3; }
+    opacity: .3;
+
     .control-icons { display: none !important; }
   }
 }
diff --git a/spec/javascripts/app/views/post_controls_view_spec.js b/spec/javascripts/app/views/post_controls_view_spec.js
index e85cf571f..291d19b18 100644
--- a/spec/javascripts/app/views/post_controls_view_spec.js
+++ b/spec/javascripts/app/views/post_controls_view_spec.js
@@ -74,12 +74,15 @@ describe("app.views.PostControls", function() {
     });
 
     it("calls destroyModel when removing a post", function() {
-      spyOn(app.views.PostControls.prototype, "destroyModel");
+      spyOn(app.views.PostControls.prototype, "destroyModel").and.callThrough();
+      spyOn(app.views.Post.prototype, "destroyModel");
       app.currentUser = new app.models.User(this.model.attributes.author);
-      this.view = new app.views.PostControls({model: this.model});
+      this.postView = new app.views.Post({model: this.model});
+      this.view = new app.views.PostControls({model: this.model, post: this.postView});
       this.view.render();
       this.view.$(".remove_post.delete").click();
       expect(app.views.PostControls.prototype.destroyModel).toHaveBeenCalled();
+      expect(app.views.Post.prototype.destroyModel).toHaveBeenCalled();
     });
 
     it("calls hidePost when hiding a post", function() {

From 8a98cd4517e599724b3ca3b68e233c3e6038e848 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 23 Mar 2017 01:02:33 +0100
Subject: [PATCH 20/40] Refactor destroyModel function in base view

closes #7385
---
 Changelog.md                        |  1 +
 app/assets/javascripts/app/views.js | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8fb0c37ce..0ce0422ef 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
 * Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
 * Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
+* Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index d0bede4ea..16a033280 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -132,19 +132,20 @@ app.views.Base = Backbone.View.extend({
 
   destroyModel: function(evt) {
     evt && evt.preventDefault();
-    var self = this;
     var url = this.model.urlRoot + "/" + this.model.id;
 
     if( confirm(_.result(this, "destroyConfirmMsg")) ) {
       this.$el.addClass("deleting");
-      this.model.destroy({ url: url })
-        .done(function() {
-          self.remove();
-        })
-        .fail(function() {
-          self.$el.removeClass("deleting");
+      this.model.destroy({
+        url: url,
+        success: function() {
+          this.remove();
+        }.bind(this),
+        error: function() {
+          this.$el.removeClass("deleting");
           app.flashMessages.error(Diaspora.I18n.t("failed_to_remove"));
-        });
+        }.bind(this)
+      });
     }
   },
 

From 6f3c61d8f2c2dcbfae0c2998ac2aa681ec6d12f7 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Wed, 22 Mar 2017 11:25:41 +0100
Subject: [PATCH 21/40] Increase maximal height of large thumbnail

Fixes #6248, supersedes #6244.

closes #7383
---
 Changelog.md                     | 1 +
 app/uploaders/processed_image.rb | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0ce0422ef..54e1866bb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@
 * Remove unused setPreload function [#7354](https://github.com/diaspora/diaspora/pull/7354)
 * Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
 * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
+* Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 71bae76a1..68b540cf9 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -18,16 +18,15 @@ class ProcessedImage < CarrierWave::Uploader::Base
   end
 
   version :thumb_small do
-    process :resize_to_fill => [50,50]
+    process resize_to_fill: [50, 50]
   end
   version :thumb_medium do
-    process :resize_to_limit => [100,100]
+    process resize_to_limit: [100, 100]
   end
   version :thumb_large do
-    process :resize_to_limit => [300,300]
+    process resize_to_limit: [300, 1500]
   end
   version :scaled_full do
-    process :resize_to_limit => [700,nil]
+    process resize_to_limit: [700, nil]
   end
-
 end

From 13a44be30698fad485c14f911558b0c40d78e9d0 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 18:43:23 +0100
Subject: [PATCH 22/40] Reduce size of conversation recipients in conversation
 form

Fixes #7321.
---
 app/assets/stylesheets/conversations.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss
index 2c5b7b7e7..7c0bf90c5 100644
--- a/app/assets/stylesheets/conversations.scss
+++ b/app/assets/stylesheets/conversations.scss
@@ -197,16 +197,14 @@
 }
 
 .recipients-tag-list {
+  margin: 0 -2px $form-group-margin-bottom;
+
   .conversation-recipient-tag {
     background-color: $brand-primary;
     border-radius: $btn-border-radius-base;
     display: inline-flex;
-    margin: 0 2px $form-group-margin-bottom;
-    padding: 8px;
-
-    &:first-child { margin-left: 0; }
-
-    &:last-child { margin-right: 0; }
+    margin: 0 2px;
+    padding: $btn-border-radius-base;
 
     div {
       align-self: center;
@@ -215,9 +213,9 @@
   }
 
   .avatar {
-    height: 40px;
+    height: 35px;
     margin-right: 8px;
-    width: 40px;
+    width: 35px;
   }
 
   .name-and-handle {

From 4a944c5ab4f7703a549d0e58d86945b964ba4012 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 18:58:55 +0100
Subject: [PATCH 23/40] Use small avatar in the person json

closes #7376
---
 Changelog.md         |  1 +
 app/models/person.rb | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 54e1866bb..47f0e50ea 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@
 * Remove jQuery deprecations [#7356](https://github.com/diaspora/diaspora/pull/7356)
 * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 * Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
+* Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/app/models/person.rb b/app/models/person.rb
index 8e0d5b6e2..1f86c28bc 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -271,12 +271,12 @@ class Person < ActiveRecord::Base
   def as_json( opts = {} )
     opts ||= {}
     json = {
-      :id => self.id,
-      :guid => self.guid,
-      :name => self.name,
-      :avatar => self.profile.image_url(:thumb_medium),
-      :handle => self.diaspora_handle,
-      :url => Rails.application.routes.url_helpers.person_path(self),
+      id:     id,
+      guid:   guid,
+      name:   name,
+      avatar: profile.image_url(:thumb_small),
+      handle: diaspora_handle,
+      url:    Rails.application.routes.url_helpers.person_path(self)
     }
     json.merge!(:tags => self.profile.tags.map{|t| "##{t.name}"}) if opts[:includes] == "tags"
     json

From d59ede46df9ecca072c5000bfa2aee8d271e4a2b Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 00:11:28 +0100
Subject: [PATCH 24/40] Remove styles for removed elements

---
 app/assets/stylesheets/mobile/mobile.scss | 14 ----------
 app/assets/stylesheets/rtl.scss           | 34 -----------------------
 2 files changed, 48 deletions(-)

diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index e48c64596..54d01870e 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -625,20 +625,6 @@ h1.session {
   font-weight: 200;
 }
 
-form p.checkbox_select {
-  position: relative;
-  label {
-    left: 25px;
-    top: 4px;
-    position: absolute;
-    font-size: 1em;
-  }
-  img {
-    position: relative;
-    top: 6px;
-  }
-}
-
 #profile_photo_upload {
   margin-top: 5px;
   min-height: 100px;
diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss
index bec248686..76180a062 100644
--- a/app/assets/stylesheets/rtl.scss
+++ b/app/assets/stylesheets/rtl.scss
@@ -3,21 +3,11 @@ body {
   text-align: right;
 }
 
-.right {
-  left: 0;
-  right: auto;
-}
-
 .stream-element .content {
   padding-right: 60px;
   padding-left: 0;
 }
 
-.stream-element .right {
-  left: 12px;
-  right: auto;
-}
-
 ul.as-selections li {
   float: right;
 }
@@ -41,16 +31,6 @@ ul.as-selections li.as-selection-item {
   padding-right: 120px;
 }
 
-form p.checkbox_select label {
-  right: 20px;
-  left: auto;
-}
-
-#update_profile_form h4 textarea[placeholder] {
-  right: -9999px;
-  left: auto;
-}
-
 label {
   right: 0.48em;
   left: auto;
@@ -61,20 +41,6 @@ ul, ol {
   padding-right: 3.333em;
 }
 
-.last {
-  margin-left: 0;
-}
-
-ul.comments li .content, ul.show_comments li .content, div.likes li .content, div.dislikes li .content {
-  padding-left: 10px;
-  padding-right: 36px;
-}
-
-ul.comments li form p, ul.show_comments li form p, div.likes li form p, div.dislikes li form p {
-  left: auto;
-  right: 35px;
-}
-
 .stream .stream-element time {
   right: auto;
   left: 20px;

From 2c53c2941eb77b598c9560a8ad26fba2a8513dcf Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 00:13:32 +0100
Subject: [PATCH 25/40] Remove unused rtl styles

---
 app/assets/stylesheets/rtl.scss | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss
index 76180a062..057d6a30b 100644
--- a/app/assets/stylesheets/rtl.scss
+++ b/app/assets/stylesheets/rtl.scss
@@ -3,11 +3,6 @@ body {
   text-align: right;
 }
 
-.stream-element .content {
-  padding-right: 60px;
-  padding-left: 0;
-}
-
 ul.as-selections li {
   float: right;
 }
@@ -41,21 +36,6 @@ ul, ol {
   padding-right: 3.333em;
 }
 
-.stream .stream-element time {
-  right: auto;
-  left: 20px;
-}
-
-.stream-element.conversation .message-count {
-  right: auto;
-  left: 10px;
-}
-
-.stream-element.conversation .timestamp {
-  right: auto;
-  left: 10px;
-}
-
 div.content span.rtl {
   display: block;
 }

From 4a56c0465ce4cbf8791ddc044e38e4fb02592d13 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Sun, 19 Mar 2017 00:14:11 +0100
Subject: [PATCH 26/40] Remove outdated rtl styles

These lines might have been necessary some time ago but now they are making things worse.

closes #7374
---
 Changelog.md                    |  1 +
 app/assets/stylesheets/rtl.scss | 15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 47f0e50ea..9931e37cc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@
 * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
 * Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
 * Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
+* Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss
index 057d6a30b..bc260b9b5 100644
--- a/app/assets/stylesheets/rtl.scss
+++ b/app/assets/stylesheets/rtl.scss
@@ -16,21 +16,6 @@ ul.as-selections li.as-selection-item {
   padding: 3px 6px 3px 0;
 }
 
-#profile_photo_upload img {
-  left: auto;
-  right: 0;
-}
-
-#profile_photo_upload {
-  padding-left: 0;
-  padding-right: 120px;
-}
-
-label {
-  right: 0.48em;
-  left: auto;
-}
-
 ul, ol {
   margin: 0 0 1.5em 1.5em;
   padding-right: 3.333em;

From 7feed3545c06ac9438b0ec0b0955a5f8d43d5448 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Mon, 27 Mar 2017 13:41:46 +0200
Subject: [PATCH 27/40] Create mention success flash message with JavaScript

---
 app/assets/javascripts/app/views/profile_header_view.js | 4 ++--
 app/controllers/status_messages_controller.rb           | 6 ------
 config/locales/diaspora/en.yml                          | 2 --
 config/locales/javascript/javascript.en.yml             | 1 +
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/views/profile_header_view.js b/app/assets/javascripts/app/views/profile_header_view.js
index 1522b71e4..1fb6e0e1d 100644
--- a/app/assets/javascripts/app/views/profile_header_view.js
+++ b/app/assets/javascripts/app/views/profile_header_view.js
@@ -69,8 +69,8 @@ app.views.ProfileHeader = app.views.Base.extend({
       $("#mentionModal").modal("hide");
       app.publisher.clear();
       app.publisher.remove();
-      location.reload();
-    });
+      app.flashMessages.success(Diaspora.I18n.t("publisher.mention_success", {names: this.model.get("name")}));
+    }.bind(this));
   },
 
   mentionModalHidden: function() {
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 87db1237f..e65e4b54a 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -53,7 +53,6 @@ class StatusMessagesController < ApplicationController
       public:     normalize_public_flag
     )
     status_message = StatusMessageCreationService.new(current_user).create(normalized_params)
-    handle_mention_feedback(status_message)
     respond_to do |format|
       format.html { redirect_to :back }
       format.mobile { redirect_to stream_path }
@@ -78,11 +77,6 @@ class StatusMessagesController < ApplicationController
     end
   end
 
-  def handle_mention_feedback(status_message)
-    return unless comes_from_others_profile_page?
-    flash[:notice] = t("status_messages.create.success", names: status_message.mentioned_people_names)
-  end
-
   def comes_from_others_profile_page?
     coming_from_profile_page? && !own_profile_page?
   end
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e6bc47001..3aeb5d5b8 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1090,8 +1090,6 @@ en:
   status_messages:
     new:
       mentioning: "Mentioning: %{person}"
-    create:
-      success: "Successfully mentioned: %{names}"
     too_long: "Please make your status message fewer than %{count} characters. Right now it is %{current_length} characters"
 
   stream_helper:
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index bea00ddee..3a93a9d5e 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -169,6 +169,7 @@ en:
           list: "list text here"
           quote: "quotation text here"
           code: "code here"
+      mention_success: "Successfully mentioned: <%= names %>"
 
     bookmarklet:
       post_something: "Post to diaspora*"

From 35f4d61d112dde19d1ffee0aa48f89bbb0a1e516 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Sun, 26 Mar 2017 00:29:23 +0100
Subject: [PATCH 28/40] Disable rack session cookie for sidekiq

Since 4.2.3 sidekiq allows to disable its own session cookie for the
case where the app provides a session already.

closes #7395
---
 Changelog.md     | 1 +
 config/routes.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 9931e37cc..3247122c7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@
 * Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375)
 * Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
 * Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
+* Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/config/routes.rb b/config/routes.rb
index 288733244..2064f4475 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,8 +2,9 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'sidekiq/web'
+require "sidekiq/web"
 require "sidekiq/cron/web"
+Sidekiq::Web.set :sessions, false # disable rack session cookie
 
 Diaspora::Application.routes.draw do
 

From 38450eacea52b241b92b9b8a4d2b0ce7c186e6fe Mon Sep 17 00:00:00 2001
From: Waithamai <waithamai@geraspora.de>
Date: Tue, 28 Mar 2017 05:27:01 +0200
Subject: [PATCH 29/40] Added spacing between list items fixes #7400

closes #7401
---
 Changelog.md                                 | 1 +
 app/assets/stylesheets/markdown-content.scss | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3247122c7..acc2a93a6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
 * Increase maximal height of large thumbnail on mobile [#7383](https://github.com/diaspora/diaspora/pull/7383)
 * Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
 * Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
+* Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/app/assets/stylesheets/markdown-content.scss b/app/assets/stylesheets/markdown-content.scss
index 316907fb1..6b092dbdb 100644
--- a/app/assets/stylesheets/markdown-content.scss
+++ b/app/assets/stylesheets/markdown-content.scss
@@ -3,8 +3,9 @@
   p:last-child { margin-bottom: 0; }
 
   ul, ol {
-    margin-top:0.8em;
-    margin-bottom:0.8em;
+    margin-bottom: .8em;
+    margin-top: .8em;
+    li { margin-bottom: .5em; }
     &:first-child { margin-top: 0; }
     &:last-child { margin-bottom: 0; }
   }

From 577ead7768b1a666bb1d4891a03bdb2ef31d719f Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Tue, 28 Mar 2017 12:52:35 +0200
Subject: [PATCH 30/40] Fix mobile delete original reshare test

closes #7403
---
 features/mobile/reshare.feature | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/features/mobile/reshare.feature b/features/mobile/reshare.feature
index 26441a78a..10b7b85b6 100644
--- a/features/mobile/reshare.feature
+++ b/features/mobile/reshare.feature
@@ -36,8 +36,7 @@ Feature: resharing from the mobile
     And I am on "alice@alice.alice"'s page
     And I click to delete the first post
     And I log out
-    And I toggle the mobile view
-    And I sign in as "bob@bob.bob"
+    And I sign in as "bob@bob.bob" on the mobile website
     Then I should see "Original post deleted by author" within ".reshare"
     And I log out
     And I sign in as "eve@eve.eve" on the mobile website

From 6f14040e8ec05ef222bdb67215a2fd40655079fb Mon Sep 17 00:00:00 2001
From: flaburgan <flaburgan@geexxx.fr>
Date: Tue, 28 Mar 2017 13:06:47 +0200
Subject: [PATCH 31/40] Fix invitation from sidebar

closes #7404
---
 features/desktop/invitations.feature | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature
index 683006b9b..dd38873cc 100644
--- a/features/desktop/invitations.feature
+++ b/features/desktop/invitations.feature
@@ -46,7 +46,8 @@ Feature: Invitations
     And I fill in the following:
       | email_inviter_emails         | alex@example.com    |
     And I press "Send an invitation"
-    Then I should have 1 Devise email delivery
+    Then I should see a flash message indicating success
+    And I should have 1 Devise email delivery
     And I should not see "change your notification settings" in the last sent email
 
   Scenario: sends an invitation from the stream
@@ -56,7 +57,8 @@ Feature: Invitations
     And I fill in the following:
       | email_inviter_emails         | alex@example.com    |
     And I press "Send an invitation"
-    Then I should have 1 Devise email delivery
+    Then I should see a flash message indicating success
+    And I should have 1 Devise email delivery
     And I should not see "change your notification settings" in the last sent email
 
   Scenario: sends an invitation from the people search page

From 483f738a0f7741c1a0e463bc5690324340dd1128 Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sat, 1 Apr 2017 15:46:28 +0300
Subject: [PATCH 32/40] Remove unused json_spec gem

---
 Gemfile                 | 1 -
 Gemfile.lock            | 4 ----
 features/support/env.rb | 1 -
 3 files changed, 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6db6ec2c8..1fb74a0e1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -288,7 +288,6 @@ group :test do
   gem "poltergeist",        "1.13.0"
 
   gem "cucumber-api-steps", "0.13", require: false
-  gem "json_spec", "1.1.4"
 
   # General helpers
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 880e2415f..3241688a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -344,9 +344,6 @@ GEM
       url_safe_base64
     json-schema (2.8.0)
       addressable (>= 2.4)
-    json_spec (1.1.4)
-      multi_json (~> 1.0)
-      rspec (>= 2.0, < 4.0)
     jsonpath (0.5.8)
       multi_json
     jwt (1.5.6)
@@ -837,7 +834,6 @@ DEPENDENCIES
   js_image_paths (= 0.1.0)
   json (= 1.8.6)
   json-schema (= 2.8.0)
-  json_spec (= 1.1.4)
   leaflet-rails (= 0.7.7)
   logging-rails (= 0.5.0)
   markerb (= 1.1.0)
diff --git a/features/support/env.rb b/features/support/env.rb
index c26248a98..0fb5dede3 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -16,7 +16,6 @@ require "capybara/session"
 require "capybara/poltergeist"
 
 require "cucumber/api_steps"
-require "json_spec/cucumber"
 
 # Ensure we know the appservers port
 Capybara.server_port = AppConfig.pod_uri.port

From f1c1091162b80c48919f0fe7d74f35f2edc62fd1 Mon Sep 17 00:00:00 2001
From: cmrd Senya <senya@riseup.net>
Date: Sat, 1 Apr 2017 15:47:02 +0300
Subject: [PATCH 33/40] Remove unused cucumber step

"should see JSON"

closes #7410
---
 Changelog.md                           | 1 +
 features/step_definitions/web_steps.rb | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 29bab8493..bb31193ba 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 * Reduce conversation recipient size [#7376](https://github.com/diaspora/diaspora/pull/7376)
 * Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
 * Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
+* Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 74c1d0b42..f2c564c8f 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -95,13 +95,6 @@ When /^(?:|I )attach the file "([^"]*)" to (?:hidden )?"([^"]*)"(?: within "([^"
   end
 end
 
-Then /^(?:|I )should see JSON:$/ do |expected_json|
-  require 'json'
-  expected = JSON.pretty_generate(JSON.parse(expected_json))
-  actual   = JSON.pretty_generate(JSON.parse(response.body))
-  expected.should == actual
-end
-
 Then /^(?:|I )should see (\".+?\"[\s]*)(?:[\s]+within[\s]* "([^"]*)")?$/ do |vars, selector|
   vars.scan(/"([^"]+?)"/).flatten.each do |text|
     with_scope(selector) do

From 30fad8279b4f0df645d0b025cc78296c07e66472 Mon Sep 17 00:00:00 2001
From: Amadren <sazert103@californiacolleges.edu>
Date: Wed, 15 Mar 2017 14:10:02 +0100
Subject: [PATCH 34/40] Improve csp for a better cloudflare support

closes #7367
---
 Changelog.md                          | 1 +
 config/diaspora.yml.example           | 3 ++-
 config/initializers/secure_headers.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index bb31193ba..2ea388d95 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@
 * Cleanup rtl css [#7374](https://github.com/diaspora/diaspora/pull/7374)
 * Increase visual spacing between list items [#7401](https://github.com/diaspora/diaspora/pull/7401)
 * Remove unused gem and cucumber step [#7410](https://github.com/diaspora/diaspora/pull/7410)
+* Disable CSP header when `report_only` and no `report_uri` is set [#7367](https://github.com/diaspora/diaspora/pull/7367)
 
 ## Bug fixes
 * Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 833f36bb0..7d8b99ee6 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -567,10 +567,11 @@ configuration: ## Section
     ## party domains from services that are included in diaspora*, like OEmbed
     ## scripts, so you can safely activate it by setting `report_only` to false. If
     ## you customized diaspora* (edited templates or added own JS), additional work
-    ## may be required. You can test the policy with the "report_uri". Our default CSP
+    ## may be required. You can test the policy with the `report_uri`. Our default CSP
     ## does not work with Google analytics or Piwik, because they inject JS code that
     ## is blocked by CSP.
     csp:
+
       ## Report-Only header (default=true)
       ## By default diaspora* adds only a "Content-Security-Policy-Report-Only" header. If you set
       ## this to false, the "Content-Security-Policy" header is added instead.
diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb
index 84e2415c7..99d3fd2c5 100644
--- a/config/initializers/secure_headers.rb
+++ b/config/initializers/secure_headers.rb
@@ -44,7 +44,7 @@ SecureHeaders::Configuration.default do |config|
 
   if AppConfig.settings.csp.report_only?
     config.csp = SecureHeaders::OPT_OUT
-    config.csp_report_only = csp
+    config.csp_report_only = csp if AppConfig.settings.csp.report_uri.present?
   else
     config.csp = csp
   end

From 791e74104e4ee0ad858a0ff014b9747f596ebdf3 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 14:10:12 +0200
Subject: [PATCH 35/40] Fix taggable path in text formatter comment [ci skip]

---
 app/assets/javascripts/app/helpers/text_formatter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/helpers/text_formatter.js b/app/assets/javascripts/app/helpers/text_formatter.js
index a9ea53d3a..b8f46f7ef 100644
--- a/app/assets/javascripts/app/helpers/text_formatter.js
+++ b/app/assets/javascripts/app/helpers/text_formatter.js
@@ -45,7 +45,7 @@
                            "_" +
                            "\\-" +
                      "]+|<3",
-      // compare tag_strings in lib/diaspora/taggabe.rb
+      // compare tag_strings in lib/diaspora/taggable.rb
       preceding: "^|\\s"
     });
 

From 1c1af74e9f3cfc5f54ba07ecec78ccc1a6379308 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 15:02:55 +0200
Subject: [PATCH 36/40] Add avatar fallback for typeahead suggestions

---
 app/assets/javascripts/app/views.js           |  7 +++++--
 .../javascripts/app/views/search_base_view.js |  7 +++++++
 .../app/views/search_base_view_spec.js        | 19 +++++++++++++++++++
 spec/javascripts/app/views_spec.js            |  6 ++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js
index 16a033280..1249d3d3a 100644
--- a/app/assets/javascripts/app/views.js
+++ b/app/assets/javascripts/app/views.js
@@ -55,8 +55,7 @@ app.views.Base = Backbone.View.extend({
       .html(this.template(presenter))
       .attr("data-template", _.last(this.templateName.split("/")));
 
-    // add avatar fallback if it can't be loaded
-    this.$el.find(this.avatars.selector).on("error", this.avatars.fallback);
+    this.setupAvatarFallback(this.$el);
 
     // add placeholder support for old browsers
     this.$("input, textarea").placeholder();
@@ -154,6 +153,10 @@ app.views.Base = Backbone.View.extend({
       $(this).attr("src", ImagePaths.get("user/default.png"));
     },
     selector: "img.avatar"
+  },
+
+  setupAvatarFallback: function(el) {
+    el.find(this.avatars.selector).on("error", this.avatars.fallback);
   }
 });
 
diff --git a/app/assets/javascripts/app/views/search_base_view.js b/app/assets/javascripts/app/views/search_base_view.js
index eb00aaeaa..0d119938a 100644
--- a/app/assets/javascripts/app/views/search_base_view.js
+++ b/app/assets/javascripts/app/views/search_base_view.js
@@ -7,6 +7,7 @@ app.views.SearchBase = app.views.Base.extend({
     if(options.customSearch) { this.setupCustomSearch(); }
     this.setupTypeahead();
     if(options.autoselect) { this.setupAutoselect(); }
+    this.setupTypeaheadAvatarFallback();
   },
 
   bloodhoundTokenizer: function(str) {
@@ -110,6 +111,12 @@ app.views.SearchBase = app.views.Base.extend({
     });
   },
 
+  setupTypeaheadAvatarFallback: function() {
+    this.typeaheadInput.on("typeahead:render", function() {
+      this.setupAvatarFallback(this.$el);
+    }.bind(this));
+  },
+
   ignorePersonForSuggestions: function(person) {
     if(person.handle) { this.ignoreDiasporaIds.push(person.handle); }
   }
diff --git a/spec/javascripts/app/views/search_base_view_spec.js b/spec/javascripts/app/views/search_base_view_spec.js
index 905c17da0..5536937bd 100644
--- a/spec/javascripts/app/views/search_base_view_spec.js
+++ b/spec/javascripts/app/views/search_base_view_spec.js
@@ -57,6 +57,12 @@ describe("app.views.SearchBase", function() {
       this.view = new app.views.SearchBase({el: "#search_people_form", typeaheadInput: $("#q"), autoselect: true});
       expect(app.views.SearchBase.prototype.setupAutoselect).toHaveBeenCalled();
     });
+
+    it("calls setupTypeaheadAvatarFallback", function() {
+      spyOn(app.views.SearchBase.prototype, "setupTypeaheadAvatarFallback");
+      this.view = new app.views.SearchBase({el: "#search_people_form", typeaheadInput: $("#q")});
+      expect(app.views.SearchBase.prototype.setupTypeaheadAvatarFallback).toHaveBeenCalled();
+    });
   });
 
   describe("bloodhoundTokenizer", function() {
@@ -261,6 +267,19 @@ describe("app.views.SearchBase", function() {
     });
   });
 
+  describe("setupTypeaheadAvatarFallback", function() {
+    beforeEach(function() {
+      this.view = new app.views.SearchBase({el: "#search_people_form", typeaheadInput: $("#q")});
+    });
+
+    it("calls setupAvatarFallback when showing the results", function() {
+      spyOn(this.view, "setupAvatarFallback");
+      this.view.setupTypeaheadAvatarFallback();
+      this.search(this.view, "user");
+      expect(this.view.setupAvatarFallback).toHaveBeenCalled();
+    });
+  });
+
   describe("ignorePersonForSuggestions", function() {
     beforeEach(function() {
       this.view = new app.views.SearchBase({el: "#search_people_form", typeaheadInput: $("#q")});
diff --git a/spec/javascripts/app/views_spec.js b/spec/javascripts/app/views_spec.js
index 84c912d15..370912436 100644
--- a/spec/javascripts/app/views_spec.js
+++ b/spec/javascripts/app/views_spec.js
@@ -163,5 +163,11 @@ describe("app.views.Base", function(){
       expect(window.autosize).toHaveBeenCalled();
       expect(window.autosize.calls.mostRecent().args[0].is("textarea")).toBe(true);
     });
+
+    it("calls setupAvatarFallback", function() {
+      spyOn(this.view, "setupAvatarFallback");
+      this.view.renderTemplate();
+      expect(this.view.setupAvatarFallback).toHaveBeenCalled();
+    });
   });
 });

From bcb75e308218c1c452d2b0bea7957d3cc6d4aab8 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 15:03:11 +0200
Subject: [PATCH 37/40] Add avatar fallback for conversations view

Fixes #4991
---
 .../javascripts/app/views/conversations_form_view.js       | 5 +++--
 .../javascripts/app/views/conversations_inbox_view.js      | 3 ++-
 spec/javascripts/app/views/conversations_form_view_spec.js | 6 ++++++
 .../javascripts/app/views/conversations_inbox_view_spec.js | 7 +++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/conversations_form_view.js b/app/assets/javascripts/app/views/conversations_form_view.js
index 74f848de3..e3b553b7a 100644
--- a/app/assets/javascripts/app/views/conversations_form_view.js
+++ b/app/assets/javascripts/app/views/conversations_form_view.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
-app.views.ConversationsForm = Backbone.View.extend({
+app.views.ConversationsForm = app.views.Base.extend({
   el: ".conversations-form-container",
 
   events: {
@@ -39,8 +39,9 @@ app.views.ConversationsForm = Backbone.View.extend({
     this.conversationRecipients.push(person);
     this.updateContactIdsListInput();
     /* eslint-disable camelcase */
-    this.tagListElement.append(HandlebarsTemplates.conversation_recipient_tag_tpl(person));
+    var personEl = $(HandlebarsTemplates.conversation_recipient_tag_tpl(person)).appendTo(this.tagListElement);
     /* eslint-enable camelcase */
+    this.setupAvatarFallback(personEl);
   },
 
   prefill: function(handles) {
diff --git a/app/assets/javascripts/app/views/conversations_inbox_view.js b/app/assets/javascripts/app/views/conversations_inbox_view.js
index 4e301a8a0..67292cc75 100644
--- a/app/assets/javascripts/app/views/conversations_inbox_view.js
+++ b/app/assets/javascripts/app/views/conversations_inbox_view.js
@@ -1,6 +1,6 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
-app.views.ConversationsInbox = Backbone.View.extend({
+app.views.ConversationsInbox = app.views.Base.extend({
   el: "#conversations-container",
 
   events: {
@@ -46,6 +46,7 @@ app.views.ConversationsInbox = Backbone.View.extend({
   setupConversation: function() {
     app.helpers.timeago($(this.el));
     $(".control-icons a").tooltip({placement: "bottom"});
+    this.setupAvatarFallback(this.$el);
 
     var conv = $(".conversation-wrapper .stream-element.selected"),
         cBadge = $("#conversations-link .badge");
diff --git a/spec/javascripts/app/views/conversations_form_view_spec.js b/spec/javascripts/app/views/conversations_form_view_spec.js
index 46c170f3a..232a7f7de 100644
--- a/spec/javascripts/app/views/conversations_form_view_spec.js
+++ b/spec/javascripts/app/views/conversations_form_view_spec.js
@@ -60,6 +60,12 @@ describe("app.views.ConversationsForm", function() {
       this.target.addRecipient({name: "diaspora user", handle: "diaspora-user@pod.tld"});
       expect($(".conversation-recipient-tag").length).toBe(1);
     });
+
+    it("calls setupAvatarFallback", function() {
+      spyOn(this.target, "setupAvatarFallback");
+      this.target.addRecipient({name: "diaspora user", handle: "diaspora-user@pod.tld"});
+      expect(this.target.setupAvatarFallback).toHaveBeenCalled();
+    });
   });
 
   describe("prefill", function() {
diff --git a/spec/javascripts/app/views/conversations_inbox_view_spec.js b/spec/javascripts/app/views/conversations_inbox_view_spec.js
index 8ba41bb86..841f189f0 100644
--- a/spec/javascripts/app/views/conversations_inbox_view_spec.js
+++ b/spec/javascripts/app/views/conversations_inbox_view_spec.js
@@ -100,6 +100,13 @@ describe("app.views.ConversationsInbox", function() {
         $(".conversation-wrapper > .conversation.unread").addClass("selected");
       });
 
+      it("calls setupAvatarFallback", function() {
+        this.view = new app.views.ConversationsInbox();
+        spyOn(this.view, "setupAvatarFallback");
+        this.view.setupConversation();
+        expect(this.view.setupAvatarFallback).toHaveBeenCalled();
+      });
+
       it("removes the unread class from the conversation", function() {
         expect($(".conversation-wrapper > .conversation.selected")).toHaveClass("unread");
         new app.views.ConversationsInbox();

From bf105db2972f5c59fc6a626cd5219a1cde41bf22 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 16:27:12 +0200
Subject: [PATCH 38/40] Use setupAvatarFallback in tags and notification
 dropdown view

---
 .../javascripts/app/views/notification_dropdown_view.js       | 2 +-
 app/assets/javascripts/app/views/tags_view.js                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/notification_dropdown_view.js b/app/assets/javascripts/app/views/notification_dropdown_view.js
index 02c3a7137..c33287787 100644
--- a/app/assets/javascripts/app/views/notification_dropdown_view.js
+++ b/app/assets/javascripts/app/views/notification_dropdown_view.js
@@ -96,7 +96,7 @@ app.views.NotificationDropdown = app.views.Base.extend({
 
   afterNotificationChanges: function(node) {
     node.find(".unread-toggle .entypo-eye").tooltip("destroy").tooltip();
-    node.find(this.avatars.selector).on("error", this.avatars.fallback);
+    this.setupAvatarFallback(node);
   },
 
   finishLoading: function() {
diff --git a/app/assets/javascripts/app/views/tags_view.js b/app/assets/javascripts/app/views/tags_view.js
index 3dda23c05..8d25c9800 100644
--- a/app/assets/javascripts/app/views/tags_view.js
+++ b/app/assets/javascripts/app/views/tags_view.js
@@ -1,12 +1,12 @@
 // @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
-app.views.Tags = Backbone.View.extend({
+app.views.Tags = app.views.Base.extend({
   initialize: function(opts) {
     if(app.publisher) {
       app.publisher.setText("#"+ opts.hashtagName + " ");
     }
     // add avatar fallback if it can't be loaded
-    $(app.views.Base.prototype.avatars.selector).on("error", app.views.Base.prototype.avatars.fallback);
+    this.setupAvatarFallback($("#tags_show"));
   }
 });
 // @license-end

From 3971a24d682bad183eccba98ec289712280ab59d Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Thu, 6 Apr 2017 16:44:38 +0200
Subject: [PATCH 39/40] Add avatar fallback for avatar next to publisher

closes #7414
---
 Changelog.md                         | 1 +
 app/assets/javascripts/app/router.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 2ea388d95..293e08f69 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@
 * Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382)
 * Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385)
 * Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395)
+* Add avatar fallback for typeahead and conversations [#7414](https://github.com/diaspora/diaspora/pull/7414)
 
 ## Features
 * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502)
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index ed8ec9d9a..b189cad86 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -217,6 +217,7 @@ app.Router = Backbone.Router.extend({
     app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
     if ($("#publisher").length !== 0) {
       app.publisher = app.publisher || new app.views.Publisher({collection: app.stream.items});
+      app.page.setupAvatarFallback($(".main-stream-publisher"));
     }
 
     $("#main_stream").html(app.page.render().el);

From 746cb8bfb8190b50a6da0b9ea03e8923be5377f5 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 19 Apr 2017 00:38:49 +0200
Subject: [PATCH 40/40] updated 68 locale files [ci skip]

---
 config/locales/devise/devise.de.yml           |   2 +-
 config/locales/diaspora/ar.yml                |   2 -
 config/locales/diaspora/bg.yml                |   2 -
 config/locales/diaspora/br.yml                |   2 -
 config/locales/diaspora/bs.yml                |   2 -
 config/locales/diaspora/cs.yml                |   2 -
 config/locales/diaspora/da.yml                |   6 +-
 config/locales/diaspora/de-CH.yml             | 222 +++++++++++++++++-
 config/locales/diaspora/de-moo.yml            |   2 -
 config/locales/diaspora/de.yml                |  79 ++++---
 config/locales/diaspora/de_formal.yml         |   6 +-
 config/locales/diaspora/el.yml                |   2 -
 config/locales/diaspora/en_1337.yml           |   2 -
 config/locales/diaspora/en_pirate.yml         |   2 -
 config/locales/diaspora/en_shaw.yml           |   2 -
 config/locales/diaspora/en_valspeak.yml       |   2 -
 config/locales/diaspora/eo.yml                |   2 -
 config/locales/diaspora/es-AR.yml             |  15 +-
 config/locales/diaspora/es-CL.yml             |   2 -
 config/locales/diaspora/es-MX.yml             |   2 -
 config/locales/diaspora/es.yml                |  15 +-
 config/locales/diaspora/eu.yml                |   2 -
 config/locales/diaspora/fi.yml                |   2 -
 config/locales/diaspora/fr.yml                |   6 +-
 config/locales/diaspora/he.yml                |   2 -
 config/locales/diaspora/hu.yml                |   9 +-
 config/locales/diaspora/hy.yml                |   4 +-
 config/locales/diaspora/ia.yml                |   2 -
 config/locales/diaspora/is.yml                |  36 ++-
 config/locales/diaspora/it.yml                |   2 -
 config/locales/diaspora/ja.yml                |   6 +-
 config/locales/diaspora/ka.yml                |   2 -
 config/locales/diaspora/ko.yml                |   2 -
 config/locales/diaspora/ml.yml                |   2 -
 config/locales/diaspora/nb.yml                |   2 -
 config/locales/diaspora/nds.yml               |   2 -
 config/locales/diaspora/nl.yml                |   2 -
 config/locales/diaspora/nn.yml                |   2 -
 config/locales/diaspora/oc.yml                |  26 +-
 config/locales/diaspora/pl.yml                |   2 -
 config/locales/diaspora/pt-BR.yml             |   6 +-
 config/locales/diaspora/pt-PT.yml             |   2 -
 config/locales/diaspora/ru.yml                |   2 -
 config/locales/diaspora/sc.yml                |  51 ++++
 config/locales/diaspora/si.yml                |   2 -
 config/locales/diaspora/sk.yml                |   2 -
 config/locales/diaspora/sl.yml                |   2 -
 config/locales/diaspora/sv.yml                |   2 -
 config/locales/diaspora/te.yml                |   2 -
 config/locales/diaspora/tr.yml                |   6 +-
 config/locales/diaspora/uk.yml                |   2 -
 config/locales/diaspora/vi.yml                |   2 -
 config/locales/diaspora/zh-CN.yml             |   2 -
 config/locales/diaspora/zh-TW.yml             |  61 ++---
 config/locales/javascript/javascript.da.yml   |   1 +
 .../locales/javascript/javascript.de-CH.yml   |  43 ++++
 config/locales/javascript/javascript.de.yml   |   3 +-
 .../javascript/javascript.de_formal.yml       |   1 +
 .../locales/javascript/javascript.es-AR.yml   |   1 +
 config/locales/javascript/javascript.es.yml   |   1 +
 config/locales/javascript/javascript.fr.yml   |   1 +
 config/locales/javascript/javascript.hu.yml   |   1 +
 config/locales/javascript/javascript.ja.yml   |   1 +
 config/locales/javascript/javascript.oc.yml   |   3 +-
 .../locales/javascript/javascript.pt-BR.yml   |   1 +
 config/locales/javascript/javascript.sc.yml   |   2 +
 config/locales/javascript/javascript.uk.yml   |  15 +-
 .../locales/javascript/javascript.zh-TW.yml   |  17 +-
 68 files changed, 511 insertions(+), 210 deletions(-)

diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 41efcc1a2..f9e2e8cd5 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -52,7 +52,7 @@ de:
         unlock: "Mein Konto entsperren"
       welcome: "Willkommen %{email}!"
     omniauth_callbacks:
-      failure: "Konnte dich nicht mittels %{kind} authentifizieren, denn „%{reason}”."
+      failure: "Konnte dich nicht mittels %{kind} authentifizieren, denn „%{reason}“."
       success: "Erfolgreich authentifiziert mittels %{kind}-Konto."
     passwords:
       edit:
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 6db522004..b74846d37 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -504,8 +504,6 @@ ar:
     services: "الخدمات"
     total_users: "مجموع المستخدمين"
   status_messages:
-    create:
-      success: "ذَكَرْتَ بنجاح: %{names}"
     new:
       mentioning: "ذكر %{person}"
     too_long: "{\"few\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"many\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"one\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"other\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\", \"two\"=>\"المرجو ان تكون رسالتك أقل من %{count} حرف\", \"zero\"=>\"المرجو ان تكون رسالتك أقل من %{count} حروف\"}"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 59c110e89..ebe828520 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -388,8 +388,6 @@ bg:
     stream_element:
       via: "чрез %{link}"
   status_messages:
-    create:
-      success: "Споменахте успешно: %{names}"
     new:
       mentioning: "Споменаване на %{person}"
     too_long: "{\"few\"=>\", моля съкратете съобщението си до %{count} знака\", \"many\"=>\", моля съкратете съобщението си до %{count} знака\", \"one\"=>\", моля съкратете съобщението си до %{count} знака\", \"other\"=>\", моля съкратете съобщението си до %{count} знака\", \"two\"=>\", моля съкратете съобщението си до %{count} знака\", \"zero\"=>\", моля съкратете съобщението си до %{count} знака\"}"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 86e408831..6f2c9aa2a 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -609,8 +609,6 @@ br:
       user: "Disheñvel e oa ar skeudenn guzh diouzh ar c'hod"
     placeholder: "Merkañ talvoud ar skeudenn"
   status_messages:
-    create:
-      success: "Meneget gant berzh : %{names}"
     new:
       mentioning: "Menegiñ : %{person}"
     too_long: "{\"one\"=>\"Lezit ho kemennadennoù statud dindan %{count}\", \"other\"=>\"Lezit ho kemennadennoù statud dindan %{count}\", \"zero\"=>\"Lezit ho kemennadennoù statud dindan %{count}\"}"
diff --git a/config/locales/diaspora/bs.yml b/config/locales/diaspora/bs.yml
index 01da7cf3b..0cabfae9e 100644
--- a/config/locales/diaspora/bs.yml
+++ b/config/locales/diaspora/bs.yml
@@ -584,8 +584,6 @@ bs:
       via: "putem %{link}"
       via_mobile: "putem mobitela"
   status_messages:
-    create:
-      success: "Uspješno spomenuti: %{names}"
     new:
       mentioning: "Spominje %{person}"
     too_long: "{\"few\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"many\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"one\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karakter\", \"other\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\", \"zero\"=>\"molimo da vaše poruke statusa sadrže manje nego %{count} karaktera\"}"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 9c51d9cda..20833537e 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -1021,8 +1021,6 @@ cs:
     total_users: "Celkový počet uživatelů"
     version: "Verze"
   status_messages:
-    create:
-      success: "Úspěšně zmíněno: %{names}"
     new:
       mentioning: "Zmínka: %{person}"
     too_long: "{\"few\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaky\", \"one\"=>\"prosím zkraťte svou zprávu na méně než %{count} znak\", \"other\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaků\", \"zero\"=>\"prosím zkraťte svou zprávu na méně než %{count} znaků\"}"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index fc2f00c38..66dd8dbde 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -1095,8 +1095,6 @@ da:
     total_users: "Antal brugere"
     version: "Version"
   status_messages:
-    create:
-      success: "%{names} nævnt med succes"
     new:
       mentioning: "Nævnt: %{person}"
     too_long: "Lav venligst en statusopdatering på under %{count} tegn. Lige nu er der %{current_length} tegn."
@@ -1112,6 +1110,8 @@ da:
     aspects_stream: "Aspekter"
     comment_stream:
       title: "Kommenterede indlæg"
+    commented:
+      title: "Kommenterede inlæg"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
       add_a_tag: "Tilføj et tag"
@@ -1121,6 +1121,8 @@ da:
     followed_tags_stream: "#Fulgte tags"
     like_stream:
       title: "'Synes om' strøm"
+    liked:
+      title: "Indlæg nogen syntes om"
     mentioned_stream: "@Omtaler"
     mentions:
       title: "Dine omtaler"
diff --git a/config/locales/diaspora/de-CH.yml b/config/locales/diaspora/de-CH.yml
index bf5f3a394..25091441b 100644
--- a/config/locales/diaspora/de-CH.yml
+++ b/config/locales/diaspora/de-CH.yml
@@ -9,6 +9,8 @@ de-CH:
   _contacts: "Kontäkt"
   _help: "Hilf"
   _services: "Dienscht"
+  _statistics: "Statistike"
+  _terms: "Konditione"
   account: "Konto"
   activerecord:
     errors:
@@ -21,6 +23,14 @@ de-CH:
           attributes:
             diaspora_handle:
               taken: "isch scho vergeh."
+        poll:
+          attributes:
+            poll_answers:
+              not_enough_poll_answers: "Nöd gnueg Antwortmöglichkeite aageh."
+        poll_participation:
+          attributes:
+            poll:
+              already_participated: "Du hesch bi dere Umfrog scho mitgmacht!"
         request:
           attributes:
             from_id:
@@ -42,25 +52,48 @@ de-CH:
     admin_bar:
       pages: "Siitä"
       pod_stats: "Pod Statistik"
+      report: "Uswertige"
       sidekiq_monitor: "Sidekiq-Monitor"
       user_search: "Benutzer Suechi"
       weekly_user_stats: "Wöchentlichi Benutzerstatistik"
     stats:
       2weeks: "2 Wuche"
       50_most: "50 meischt-benutzti Tags"
+      comments:
+        one: "ein Kommentar"
+        other: "%{count} Kommentär"
       current_segment: "S'aktuelle Segment het durchschnittlich <b>%{post_yest}</b> Biiträg pro Benutzer, sit em <b>%{post_day}</b>"
       daily: "Täglich"
       display_results: "Zeig d'Ergäbnis usem Segment <b>%{segment}</b>"
       go: "Los!"
       month: "Monet"
+      posts:
+        one: "ein Biitrag"
+        other: "%{count} Biiträg"
+      shares:
+        one: "EIn share"
+        other: "%{count} share's"
       tag_name: "Tag Name: <b>%{name_tag}</b> Azahl: <b>%{count_tag}</b>"
       usage_statistic: "Nutzigsstatistik"
+      users:
+        one: "Ein Benutzer"
+        other: "%{count} Benutzer"
       week: "Wuche"
     user_search:
       add_invites: "IIladige hinzuefüege"
+      are_you_sure_lock_account: "Bisch sicher das da Konto sperre wötsch?"
       email_to: "per E-Mail iilade"
       under_13: "Benutzer aazeige wo under 13ni sind (COPPA)"
+      users:
+        one: "Ein Benutzer gfunde"
+        other: "%{count} Benutzer gfunde"
+      you_currently:
+        one: "Du hesch momentan ei Iiladig vorig %{link}"
+        other: "Du hesch momentan %{count} Iiladige vorig %{link}"
     weekly_user_stats:
+      amount_of:
+        one: "Ein neue Benutzer i dere Wuche"
+        other: "%{count} neui Benutzer i dere Wuche"
       current_server: "S'Momentane Serverdatum isch %{date}"
   all_aspects: "Ali Aspekt"
   are_you_sure: "Bisch sicher?"
@@ -68,6 +101,8 @@ de-CH:
   aspect_memberships:
     destroy:
       failure: "Person us em Aspekt entferne isch gschiiteret."
+      forbidden: "Da dörfsch du nöd."
+      invalid_statement: "Dopplete Iintrag abglehnt."
       no_membership: "Die usgwählt Person isch i dem Aspekt nöd gfinde worde."
       success: "Person erfolgriich us em Aspekt entfernt."
   aspects:
@@ -149,14 +184,17 @@ de-CH:
   contacts:
     index:
       add_a_new_aspect: "en neue Aspekt mache"
+      add_contact: "Kontakt hinzuefüege"
       all_contacts: "Ali Kontäkt"
       community_spotlight: "Intressanti Lüt"
       my_contacts: "Mini Kontäkt"
       no_contacts: "Gseht uus als möstisch es paar Kontäkt hinzuefüege!"
+      no_contacts_in_aspect: "Du hesch no kei Kontäkt i dem Apekt bis etz. Une isch e Lischte vo dine existierende Kontäkt wo du chasch zu dem Aspekt hinzuefüege."
       no_contacts_message: "Lueg mal di %{community_spotlight} aa"
       only_sharing_with_me: "Eisiitig mit mir teilendi"
       start_a_conversation: "Start es Gspröch"
       title: "Kontäkt"
+      user_search: "Kontakt Suechi"
     spotlight:
       community_spotlight: "Intressanti Lüt"
       suggest_member: "Mitglied vorschloh"
@@ -164,16 +202,25 @@ de-CH:
     create:
       fail: "Ungültigi Nochricht"
       sent: "Nochricht verschickt"
+    destroy:
+      delete_success: "Gspröch erfolgriich glöscht"
+      hide_success: "Gspröch erfolgriich versteckt"
     index:
+      conversations_inbox: "Underhaltige - Iigang"
       inbox: "Poschtigang"
+      new_conversation: "Neui Underhaltig"
       no_messages: "Kei Nochrichte"
     new:
       send: "Abschicke"
       sending: "Wird gschickt..."
       subject: "Um was goht's?"
+      subject_default: "Kein Betreff"
       to: "Empfänger"
+    new_conversation:
+      fail: "Ungültigi Nochricht"
     show:
       delete: "Gspröch lösche"
+      hide: "S'Gpröch verstecke und stumm schalte"
       last_message: "Letschti Nochricht empfange %{timeago}"
       reply: "Antworte"
       replying: "Am Antworte..."
@@ -192,19 +239,22 @@ de-CH:
   help:
     account_and_data_management:
       close_account_a: "Gang as Endi vo dine Konto-Iistellige und druck uf \"Konto schlüsse\". Zum das abzschlüsse wirsch du denn ufgforderet dis Passwort iizgäh. Denk drah: Wenn du dis Konto schlüssisch chasch du dich uf dem Pod <strong>nie meh</strong> mit em gliiche Benutzername registriere."
-      close_account_q: "Wie chan ich mis konto lösche?"
+      close_account_q: "Wie chan i mis Konto lösche?"
       data_other_podmins_a: "Wenn du mit jemandem auf einem anderen Pod teilst, werden alle Beiträge, die du teilst, und eine Kopie deiner Profildaten auf dessen Pod gespeichert (\"gecached\") und sind dem Datenbankadministrator des Pods zugänglich. Wenn du einen Beitrag oder deine Profildaten löschst, geschieht dies auch auf allen anderen Pods, auf denen die Daten bisher gespeichert waren. Deine Bilder werden nur auf deinen eigenen Pod gespeichert; nur Links, die zu ihnen führen, werden anderen Pods übermittelt."
       data_other_podmins_q: "Chönd d'Admins vo andere Pods mini Informatione gseh?"
       data_visible_to_podmin_a: "Die Kommunikation *zwischen* Pods läuft immer verschlüsselt ab (via SSL und diaspora*s eigener Transport-Verschlüsselung), aber gespeichert werden die Daten unverschlüsselt. Wenn er wollte, könnte der Datenbank-Administrator deines Pods (normalerweise die Person, die den Pod betreibt) auf deine gesamten Kontodaten und alles, was du postest, zugreifen (wie auch bei den meisten anderen Webseiten, die Benutzerdaten speichern). Das Betreiben eines eigenen Pods gibt dir mehr Sicherheit, weil du dann den Zugriff auf die Datenbank kontrollierst."
       data_visible_to_podmin_q: "Wievil Informatione gseht de Administrator vo mim Pod?"
       download_data_a: "Jo, und im bereich Konto i dine Iistellige sind zwei Schaltfläche mit dene du dini Date oder Fotis abelade chasch."
-      download_data_q: "Chan ich ali date wo i uf mim Konto gspeicheret sind abelade?"
+      download_data_q: "Chan ich ali Date wo i uf mim Konto gspeicheret sind abelade?"
       move_pods_a: "In Zuekunft wirsch du d'Möglichkeit haa dis Konto z'exportiere und ufeme andere Pod z'importiere, aber das funktioniert im moment nonig. Du chasch jedoch es neus Konto eröffne dini Kontäkt neu hinzuefüege und sie aafroge wiederum mit dir z'teile."
       move_pods_q: "Wie chan i mis Konto uf en andere Pod verschiebe?"
       title: "Konto- und Dateverwaltig"
     aspects:
       title: "Aspekt"
+      what_is_an_aspect_a: "Apekt sind e Möglichkeit dini diaspora*-Kontäkt z'gruppiere. Du chasch Aspekt nutze für Lüüt a dim Arbetsplatz, für dini Familie oder für dini Fründe."
       what_is_an_aspect_q: "Was isch en Aspekt?"
+      who_sees_post_a: "Wenn du en begrenzte Biitrag erstellsch, wird er nur für d'Benutzer sichtbar sii wo du i din Aspekt tue hesch (Oder i dini Aspekt, wennd mehreri usgwählt häsch). Benutzer wo nöd i dem oder dene Apekt sind hend kei Möglichkeit din begrenzte Biitrag z'gseh."
+      who_sees_post_q: "Wer gseht en Biitrag won ich miteme Aspekt teile?"
     foundation_website: "D'Webite vo de diaspora* Stiftig"
     getting_help:
       get_support_a_hashtag: "Stell uf diaspora* e frog mithilf vomene öffentliche post du de hashtag %{question} beinhaltet"
@@ -219,11 +269,22 @@ de-CH:
     getting_started_tutorial: "\"Erschti Schritt\" Aaleitige"
     here: "do"
     irc: "IRC"
+    keyboard_shortcuts:
+      keyboard_shortcuts_li5: "r - de aktivi Biitrag wiitersägä"
+      keyboard_shortcuts_li6: "m - de aktivi Biitrag ufklappe"
+      keyboard_shortcuts_li7: "o - de erscht Link im Biitrag ufmache"
+      keyboard_shortcuts_li8: "Ctrl + Enter - Send d'Nochricht wo'd am schriibe bisch"
+      title: "Tastaturchürzel"
     markdown: "Markdown"
+    mentions:
+      title: "Erwähnige"
+      what_is_a_mention_q: "Was isch en \"Erwähnig\"?"
     third_party_tools: "Drittaawendige"
     tutorial: "Aaleitig"
     tutorials: "Aaleitige"
     wiki: "Wiki"
+  invitation_codes:
+    not_valid: "De Iiladigscode isch nüm gültig"
   invitations:
     create:
       empty: "Bitte mindestens ei E-Mail-Adresse iigä"
@@ -248,6 +309,7 @@ de-CH:
       powered_by: "Es lauft mit diaspora*"
       public_feed: "Öffentliche diaspora* Feed vo %{name}"
       source_package: "Lad's Quellcodepaket abe"
+      statistics_link: "Pod Statistike"
       toggle: "Mobiili Aasicht umschalte"
       whats_new: "Was git's neus?"
     header:
@@ -262,27 +324,48 @@ de-CH:
     also_commented:
       one: "%{actors} het au de post %{post_link} vom %{post_author} kommentiert"
       other: "%{actors} hend au de post %{post_link} vom %{post_author} kommentiert"
+    also_commented_deleted:
+      one: "%{actors} het en glöschte Biitrag kommentiert."
+      other: "%{actors} hend en glöschte Biitrag kommentiert."
     comment_on_post:
       one: "%{actors} het din Biitrag %{post_link} kommentiert."
       other: "%{actors} hend din Biitrag %{post_link} kommentiert."
       zero: "Niemer het din Biitrag %{post_link} kommentiert."
     index:
+      all_notifications: "Alli Benochritigunge"
+      also_commented: "Au kommentiert"
       and: "und"
       and_others:
         one: "und öpper meh"
         other: "und %{count} anderi"
         zero: "und niemer susch"
+      comment_on_post: "Kommentar bim Biitrag"
+      liked: "Gfallt"
       mark_all_as_read: "Ali als glese markiere"
-      mark_unread: "als ungläsä markiere"
+      mark_all_shown_as_read: "Alli als glese markiere"
+      mark_read: "Als glese markiere"
+      mark_unread: "Als unglese markiere"
+      mentioned: "Erwähnt"
+      no_notifications: "Du hesch kei Benochrichtigunge bis etz."
       notifications: "Benochtichtigunge"
+      reshared: "Wiitergseit"
+      show_all: "Alli aazeige"
+      show_unread: "Ungleseni aazeige"
+      started_sharing: "Mit teile aagfange"
     liked:
       one: "%{actors} gfallt din Biitrag %{post_link}."
       other: "%{actors} gfallt din Biitrag %{post_link}."
       zero: "%{actors} gfallt din Biitrag %{post_link}."
+    liked_post_deleted:
+      one: "%{actors} gfallt din glöschte Biitrag."
+      other: "%{actors} gfallt din glöschte Biitrag."
     mentioned:
       one: "%{actors} het di im Biitrag %{post_link} erwähnt."
       other: "%{actors} hend di im Biitrag %{post_link} erwähnt."
       zero: "%{actors} het di im Biitrag %{post_link} erwähnt."
+    mentioned_deleted:
+      one: "%{actors} het dich imene glöschte Biitrag erwähnt."
+      other: "%{actors} hend dich imene glöschte Biitrag erwähnt."
     private_message:
       one: "%{actors} het dir e Nochricht gschickt."
       other: "%{actors} hend dir e Nochricht gschickt."
@@ -290,12 +373,17 @@ de-CH:
     reshared:
       one: "%{actors} het din Biitrag %{post_link} wiitergseit."
       other: "%{actors} hend din Biitrag %{post_link} wiitergseit."
+    reshared_post_deleted:
+      one: "%{actors} het din glöschte Biitrag wiitergseit."
+      other: "%{actors} hend din glöschte Biitrag wiitergseit."
     started_sharing:
       one: "%{actors} het agfange mit dir z'teile."
       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_post_you_shared: "en Biitrag."
+    a_private_message: "Es git e neue pivati Nochricht für dich uf diaspora*"
     click_here: "druck do"
     comment_on_post:
       reply: "Schriib en Antwort oder lueg der de Biitrag vo %{name} aa >"
@@ -303,6 +391,31 @@ de-CH:
       click_link: "Klick uf dä Link zum dini neu E-Mail-Adresse %{unconfirmed_email} z'aktiviere:"
       subject: "Bitte aktivier dini neu E-Mail-Adresse %{unconfirmed_email}"
     email_sent_by_diaspora: "Das E-Mail isch vo %{pod_name} gschickt worde. Wenn du kei söttigi E-Mails me willsch,"
+    export_email:
+      subject: "Dini persönliche Date sind bereit zum abelade, %{name}."
+    export_failure_email:
+      subject: "Tschuldigung %{name}, aber es git es Problem mit dini Date"
+    export_photos_email:
+      body: |-
+          Hallo %{name}
+
+          Dini Fotis sind verarbeitet und parat zum abelade. Benutz [de Link](%{url}).
+
+          Alles Gueti
+
+          De diaspora* E-Mail Roboter!
+      subject: "Dini Fotis sind parat zum abelade, %{name}"
+    export_photos_failure_email:
+      body: |-
+          Hallo %{name}
+
+          Mir hend es Problem mitem verarbeite vo dine Fotis für de download.
+          Bitte versuechs namal
+
+          Sorry!
+
+          De diaspora* E-Mail Roboter!
+      subject: "%{name} es het es Problem mit dine Fotis geh"
     hello: "Hoi %{name}!"
     invite:
       message: |-
@@ -331,6 +444,26 @@ de-CH:
       subject: "%{name} het di uf diaspora* erwähnt"
     private_message:
       reply_to_or_view: "Schrib en Antwort oder lueg s'Gspröch aa >"
+    report_email:
+      body: |-
+          Hallo
+
+          de %{type} mit ID %{id} isch als beleidigend markiert worde.
+
+          Grund: "%{reason}"
+          [%{url}][1]
+
+          Bitte so schnell wie möglich aaluege!
+
+          Beschti Grüess
+
+          De diaspora* E-Mail Roboter!
+
+          [1]: %{url}
+      subject: "En neue %{type} isch als beleidigend markiert worde."
+      type:
+        comment: "Kommentar"
+        post: "Biitrag"
     reshared:
       reshared: "%{name} het din Biitrag wiitergseit"
       view_post: "Biitrag aaluege >"
@@ -349,11 +482,14 @@ de-CH:
     add_contact:
       invited_by: "Du bisch iglade worde vo"
     index:
-      looking_for: "Bisch uf de Suech noch mit %{tag_link} täggde Biiträg?"
+      couldnt_find_them: "Hesch's nöd gfunde?"
+      looking_for: "Bisch uf de Suechi noch mit %{tag_link} täggde Biiträg?"
       no_one_found: "...und niemer isch gfunde worde."
       no_results: "Hey! Du muesch noch öppisem sueche."
       results_for: "Suechergebnis für %{search_term}"
+      search_handle: "Benutz d'diaspora* ID (username@pod.tld) zum sichergoh dini fründe z'finde."
       searching: "Sueche, bitte bis geduldig..."
+      send_invite: "Immerno nüt? Versend en iiladig!"
     person:
       thats_you: "Das bisch du!"
     profile_sidebar:
@@ -378,6 +514,10 @@ de-CH:
     presenter:
       title: "En Biitrag vo %{name}"
     show:
+      photos_by:
+        one: "Eis Foti vo %{author}"
+        other: " %{count} Fotis vo %{author}"
+        zero: "Kei Fotis vo %{author}"
       reshare_by: "Wiitergseits vo %{author}"
   privacy: "Privatsphäre"
   profile: "Profil"
@@ -386,6 +526,11 @@ de-CH:
       allow_search: "Andere lüüt innerhalb vo diaspora* erlaube noch dir z'sueche"
       first_name: "Vorname"
       last_name: "Nochname"
+      nsfw_check: "Alles was ich teile als NSFW markiere"
+      nsfw_explanation: |-
+          NSFW (“not safe for work”) isch de selbstverwalteti Community Standard uf diaspora* zum Inhält z'markiere wo am Arbetsplatz nöd aabrocht sind.
+          Wenn du vor hesch söttigi Inhält regelmässig z'teile bitte aktivier die Option demit ali Inhält vo dir i de Streams vo de Mitbenutzer versteckt aazeigt werdet und sie selber chönd entscheide öbses jetzt wönd gseh oder nöd.
+      nsfw_explanation2: "Wenn du die Option nöd aktiviere wötsch bitte benutz de #nsfw Tag jedesmol wenn du söttigi Inhält teilsch."
       update_profile: "Profil aktualisierä"
       your_bio: "Dini Beschriibig"
       your_birthday: "Din Geburtstag"
@@ -413,8 +558,22 @@ de-CH:
       password: "Passwort"
       password_confirmation: "Passwort bestätigung"
       sign_up: "Konto mache"
+      submitting: "Übermittle..."
+      terms: "Wenn du en neue Account machsch akzeptiersch du d'%{terms_link}"
+      terms_link: "AGB's"
       username: "Benutzername"
+  report:
+    comment_label: "<b>Kommentar</b>: %{data}"
+    confirm_deletion: "Bisch sicher de Iitrag z'lösche?"
+    delete_link: "Iitrag lösche"
+    not_found: "De Biitrag/Kommentar isch nöd gfunde worde. Gseht us als wär er vom Benutzer glöscht worde!"
+    post_label: "<b>Biitrag</b>: %{content}"
+    reason_label: "Grund:"
+    reported_label: "<b>gmeldet vo</b> %{person}"
+    review_link: "Als glese markiere"
+    title: "Meldigsübersicht"
   reshares:
+    comment_email_subject: "%{resharer} Reshare vo %{author}'s Biitrag"
     reshare:
       deleted: "Originalbiitrag isch vom Verfasser glöscht worde."
       reshare_confirmation: "%{author}'s Biitrag wiitersägä?"
@@ -439,6 +598,8 @@ de-CH:
   settings: "Iistelige"
   shared:
     aspect_dropdown:
+      mobile_row_checked: "%{name} (entferne)"
+      mobile_row_unchecked: "%{name} (hinzuefüege)"
       toggle:
         one: "I %{count} aspekt"
         other: "I %{count} aspekt"
@@ -459,25 +620,52 @@ de-CH:
       visibility_dropdown: "Zum iistelle wär din post gseh dörf benutz s'dropdown menü. (Mer empfehled din erschtä Biitrag öffentlich z'mache, wellen susch niemert gseht ^^ )"
     publisher:
       discard_post: "Biitrag verwärfe"
+      formatWithMarkdown: "Du chasch din Biitrag mit %{markdown_link} formatiere"
       get_location: "Standort ermittle"
       new_user_prefill:
         hello: "Hoi zämä I bi #%{new_user_tag}. "
         i_like: "I intressier mich für %{tags}. "
         invited_by: "Danke für d'Iilagig, "
         newhere: "neudo"
+      poll:
+        add_a_poll: "E Umfrog hinzuefüege"
       posting: "Abschicke..."
+      remove_location: "Standort entferne"
       share: "Teilä"
       upload_photos: "Fotis Uelade"
       whats_on_your_mind: "Was lauft?"
     stream_element:
       via: "via %{link}"
       via_mobile: "über's Händy"
+  simple_captcha:
+    label: "De Code i d'Box iigäh:"
+    message:
+      default: "De Gheimcode het nöd mit em Bild übereingstimt."
+      failed: "Menschlichkeits überprüefig isch fehlgschlage"
+      user: "S'Gheimbild und de Code sind underschiedlich gsi"
+    placeholder: "Gib di dargstellte Zeiche ii"
+  statistics:
+    active_users_halfyear: "Aktivi Benutzer im letschte halbe Johr"
+    active_users_monthly: "Aktivi Benutzer im letschte Monet"
+    closed: "Zue"
+    disabled: "Nöd verfüegbar"
+    enabled: "Verfüegbar"
+    local_comments: "Lokali Kommentär"
+    local_posts: "Lokali Biiträg"
+    name: "Name"
+    network: "Netzwerk"
+    open: "Offe"
+    registrations: "Registrierige"
+    services: "Dienst"
+    total_users: "Total Benutzer"
+    version: "Version"
   status_messages:
-    create:
-      success: "Erfolgriich erwähnt: %{names}"
     new:
       mentioning: "Erwähnt: %{person}"
     too_long: "Bitte chürz din post uf weniger als %{count} Zeichä. Im Moment het er %{current_length}."
+  stream_helper:
+    no_more_posts: "Du bisch am Endi vom Stream aacho."
+    no_posts_yet: "Es git no kei Biiträg."
   streams:
     activity:
       title: "Mini Aktivitätä"
@@ -504,10 +692,15 @@ de-CH:
     tags:
       title: "Täggti Biiträg: %{tags}"
   tags:
+    name_too_long: "Bitte mach din Tag-Name chürzer als %{count} Zeiche. Im Moment isch er %{current_length} Zeiche lang."
     show:
       follow: "#%{tag} folge"
       none: "De läär Tag existiert nöd!"
       stop_following: "Ufhöre #%{tag} z'folge"
+      tagged_people:
+        one: "Öpper isch mit %{tag} taggt"
+        other: "%{count} Lüüt sind mit %{tag} taggt"
+        zero: "Niemert isch taggt mit %{tag}"
   username: "Benutzername"
   users:
     confirm_email:
@@ -522,6 +715,7 @@ de-CH:
       auto_follow_aspect: "Aspekt für Benutzer mit dene du automatisch afangsch teile:"
       auto_follow_back: "Automatisch mit Benutzer zruggteile wo agfange hend mit dir z'teile"
       change: "Ändere"
+      change_color_theme: "Farbthema ändere"
       change_email: "E-Mail-Adresse ändere"
       change_language: "Sproch ändere"
       change_password: "Passwort ändere"
@@ -538,21 +732,33 @@ de-CH:
       comment_on_post: "öpper en Biitrag vo dir kommentiert"
       current_password: "Aktuell's Passwort"
       current_password_expl: "Das mit demm du di aameldisch..."
+      default_post_visibility: "Vorusgwählti Aspekt bim erstelle vo Biiträg"
+      download_export: "Mis Profil abelade"
+      download_export_photos: "Mini Fotis abelade"
       edit_account: "Account bearbeite"
       email_awaiting_confirmation: "Mer hend dir en Link a %{unconfirmed_email} gschikt. Bis du de enthalteni Link göffnet hesch und so die neu Adresse aktiviersch, sendemer wiiterhin a dini alt Adresse %{email}"
       export_data: "Date exportiere"
+      export_in_progress: "Mir verarbeitet grad dini Date. Bitte chum in es paar Moment wieder verbii."
+      export_photos_in_progress: "Mier verarbeitet grad dini Fotis, bitte lueg chli spöter nomal verbii."
       following: "\"Teile\"-Iistelige"
+      last_exported_at: "Z'lescht aktualisiert am %{timestamp}"
       liked: "öpperem en Biitrag vo dir gfallt"
       mentioned: "du @erwähnt wirsch"
       new_password: "Neus Passwort"
       private_message: "du e privati Nochricht überchunsch"
       receive_email_notifications: "E-Mail-Benochritigunge empfange wänn:"
+      request_export: "Mini Profildate aafordere"
+      request_export_photos: "Mini Fotis aafordere"
+      request_export_photos_update: "Mini Fotis aktualisiere"
+      request_export_update: "Mini Profildate aktualisiere"
       reshared: "öpper din Biitrag wiiterseit"
       show_community_spotlight: "Kommunity Schiiwörferliecht im stream aazeige"
       show_getting_started: "Iistiiger hiiwiis wieder aktivierä"
+      someone_reported: "öpper en Biitrag meldet"
       started_sharing: "öpper mit dir aafangt teile"
       stream_preferences: "Stream-Iistellige"
       your_email: "Dini E-Mail-Adresse"
+      your_email_private: "Dini E-Mail wird nie andere Benutzer aazeigt"
       your_handle: "Dini diaspora* ID"
     getting_started:
       awesome_take_me_to_diaspora: "Grossartig! Bring mi zu diaspora*"
@@ -566,11 +772,15 @@ de-CH:
       who_are_you: "Wär bisch du?"
     privacy_settings:
       ignored_users: "Ignorierti Benutzer"
+      no_user_ignored_message: "Du ignoriersch im Moment kei anderi Benutzer."
       stop_ignoring: "Ignoriere ufhebe"
+      strip_exif: "Entfern Metadate, wie din Ort, Autor und Kameramodell vo ufegladene Bilder (empfohle)"
       title: "Privatsphäre-Iistelige"
     public:
       does_not_exist: "Benutzer %{username} existiert nöd!"
     update:
+      color_theme_changed: "Farbthema erfolgriich g'änderet."
+      color_theme_not_changed: "Bim ändere vom Farbthema isch en Fähler passiert."
       email_notifications_changed: "E-Mail Benochrichtigunge g'änderet"
       follow_settings_changed: "Folge-Iistelige g'änderet"
       follow_settings_not_changed: "Änderig vo de Folge-Iistelige fehlgschlage."
diff --git a/config/locales/diaspora/de-moo.yml b/config/locales/diaspora/de-moo.yml
index 07e86eed1..ea57c97a4 100644
--- a/config/locales/diaspora/de-moo.yml
+++ b/config/locales/diaspora/de-moo.yml
@@ -518,8 +518,6 @@ de-moo:
       via: "via %{link}"
       via_mobile: "über mobil"
   status_messages:
-    create:
-      success: "Erfolgreich erwähnt: %{names}"
     new:
       mentioning: "Erwähnt: %{person}"
     too_long: "{\"few\"=>\"Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen.\", \"many\"=>\"Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen.\", \"one\"=>\"Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen.\", \"other\"=>\"Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen.\", \"two\"=>\"Bitte kürze deinen Beitrag auf unter %{count} Zeichen.\", \"zero\"=>\"Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen.\"}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 733f1c71b..abfe5d2d7 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -53,7 +53,7 @@ de:
       dashboard: "Übersicht"
       pages: "Seiten"
       pod_network: "Pod-Netzwerk"
-      pod_stats: "Pod Statistik"
+      pod_stats: "Pod-Statistik"
       report: "Meldungen"
       sidekiq_monitor: "Sidekiq-Monitor"
       user_search: "Benutzersuche"
@@ -231,7 +231,7 @@ de:
         find_a_bug: "… ein %{link}?"
         have_a_question: "… eine %{link}?"
         here_to_help: "Die diaspora*-Gemeinschaft ist für dich da!"
-        mail_podmin: "Podmin E-Mail"
+        mail_podmin: "Podmin-E-Mail"
         need_help: "Benötigst du Hilfe?"
         tag_bug: "Problem"
         tag_feature: "Verbesserung"
@@ -344,11 +344,11 @@ de:
     account_and_data_management:
       close_account_a: "Gehe an das Ende deiner Konto-Einstellungen und drücke auf die Schaltfläche „Konto schließen“. Um den Vorgang abzuschließen, wirst du dann aufgefordert, dein Kennwort einzugeben. Denk dran: Wenn du dein Konto schließt, kannst du dich auf diesem Pod <strong>nie wieder</strong> mit dem gleichen Benutzernamen registrieren."
       close_account_q: "Wie kann ich mein Konto löschen?"
-      data_other_podmins_a: "Wenn du mit jemandem auf einem anderen Pod teilst, werden alle Beiträge, die du teilst, und eine Kopie deiner Profildaten auf dessen Pod gespeichert (\"gecached\") und sind dem Datenbankadministrator des Pods zugänglich. Wenn du einen Beitrag oder deine Profildaten löschst, geschieht dies auch auf allen anderen Pods, auf denen die Daten bisher gespeichert waren. Deine Bilder werden nur auf deinen eigenen Pod gespeichert; nur Links, die zu ihnen führen, werden anderen Pods übermittelt."
+      data_other_podmins_a: "Wenn du mit jemandem auf einem anderen Pod teilst, werden alle Beiträge, die du teilst, und eine Kopie deiner Profildaten auf dessen Pod gespeichert („gecached“) und sind dem Datenbankadministrator des Pods zugänglich. Wenn du einen Beitrag oder deine Profildaten löschst, geschieht dies auch auf allen anderen Pods, auf denen die Daten bisher gespeichert waren. Deine Bilder werden nur auf deinen eigenen Pod gespeichert; nur Links, die zu ihnen führen, werden anderen Pods übermittelt."
       data_other_podmins_q: "Können die Administratoren anderer Pods meine Informationen sehen?"
-      data_visible_to_podmin_a: "Die Kommunikation *zwischen* Pods läuft immer verschlüsselt ab (via SSL und diaspora*s eigener Transport-Verschlüsselung), aber gespeichert werden die Daten unverschlüsselt. Wenn er wollte, könnte der Datenbank-Administrator deines Pods (normalerweise die Person, die den Pod betreibt) auf deine gesamten Kontodaten und alles, was du postest, zugreifen (wie auch bei den meisten anderen Webseiten, die Benutzerdaten speichern). Das Betreiben eines eigenen Pods gibt dir mehr Sicherheit, weil du dann den Zugriff auf die Datenbank kontrollierst."
+      data_visible_to_podmin_a: "Kurzum: alles. Die Kommunikation zwischen Pods läuft immer verschlüsselt ab (mittels SSL und diaspora*s eigener Übertragungsverschlüsselung), aber gespeichert werden die Daten unverschlüsselt. Wenn er wollte, könnte der Datenbank-Administrator deines Pods (normalerweise die Person, die den Pod betreibt) auf deine gesamten Kontodaten und alles, was du postest, zugreifen (wie auch bei den meisten anderen Webseiten, die Benutzerdaten speichern). Das ist der Grund dafür, dass wir dich auswählen lassen, auf welchem Pod du dich registrierst, damit du einen Pod auswählen kannst, dessen Admin du deine Daten gerne anvertraust. Das Betreiben eines eigenen Pods gibt dir mehr Sicherheit, weil du dann den Zugriff auf die Datenbank kontrollierst."
       data_visible_to_podmin_q: "Wie viele Informationen kann der Administrator meines Pods sehen?"
-      download_data_a: "Ja. Unten im Bereich \"Konto\" deiner Einstellungen sind zwei Schaltflächen, mit denen du deine Daten oder Fotos herunterladen kannst."
+      download_data_a: "Ja. Unten im Bereich „Konto“ deiner Einstellungen sind zwei Schaltflächen, mit denen du deine Daten oder Fotos herunterladen kannst."
       download_data_q: "Kann ich alle Daten, welche auf meinem Konto gespeichert wurden, herunterladen?"
       move_pods_a: "In Zukunft wirst du deine Daten von einem Pod exportieren und in einem anderen importieren können, aber im Moment ist das noch nicht möglich. Du kannst aber natürlich jederzeit ein neues Konto erstellen, deine Kontakte dort erneut zu Aspekten hinzufügen und sie fragen, ob sie dich ebenfalls wieder zu ihren Aspekten hinzufügen wollen."
       move_pods_q: "Wie kann ich mein Konto auf einen anderen Pod verschieben?"
@@ -360,22 +360,22 @@ de:
       contacts_know_aspect_q: "Wissen meine Kontakte in welchem Aspekt von mir sie sind?"
       contacts_visible_a: "Wenn du diese Option anwählst, werden die Kontakte dieses Aspekts die Möglichkeit haben, auf Ihrem Profil unter Ihrem Profilbild, zu sehen wer sonst noch in diesem Aspekt ist. Es ist am besten diese Option nur anzuwählen, wenn sich alle Kontakte in diesem Aspekt untereinander kennen. Sie werden aber trotzdem nicht erfahren, wie dieser Aspekt heißt."
       contacts_visible_q: "Was bewirkt „Kontakte aus diesem Aspekt öffentlich machen“?"
-      delete_aspect_a: "Klicke in der Seitenleiste der Stream-Ansicht auf „Meine Aspekte” und dann auf das Stiftsymbol bei dem Aspekt, den du löschen möchtest, oder gehe zu deiner Kontaktseite und wähle den entsprechenden Aspekt aus. Dann klicke auf das Mülleimersymbol oben rechts auf der Seite."
+      delete_aspect_a: "Klicke in der Seitenleiste der Stream-Ansicht auf „Meine Aspekte“ und dann auf das Stiftsymbol bei dem Aspekt, den du löschen möchtest, oder gehe zu deiner Kontaktseite und wähle den entsprechenden Aspekt aus. Dann klicke auf das Mülleimersymbol oben rechts auf der Seite."
       delete_aspect_q: "Wie kann ich einen Aspekt löschen?"
       person_multiple_aspects_a: "Ja. Geh dazu auf deine Kontakte-Seite und klicke auf „Meine Kontakte“. Für jeden Kontakt kannst du das Menü auf der rechten Seite benutzen, um sie zu so vielen Aspekten hinzuzufügen (oder sie daraus zu entfernen), wie du willst. Du kannst außerdem die entsprechende Schaltfläche auf deren Profilseite verwenden. Oder du platzierst deinen Mauszeiger über deren Namen im Stream und änderst die Aspektzugehörigkeit auf der „Hovercard“, die daraufhin erscheint."
       person_multiple_aspects_q: "Kann ich eine Person zu mehreren Aspekten hinzufügen?"
-      post_multiple_aspects_a: "Ja. Benutze dazu, wenn du einen Beitrag erstellst, die Aspekt-Auswahlschaltfläche um Aspekte an- oder abzuwählen. Die Standardauswahl ist „Alle Aspekte”. Dein Beitrag wird wird für alle Aspekte, die du auswählst, sichtbar sein. Außerdem kannst du die Aspekte, mit denen du teilen willst, in der Seitenleiste auswählen. Wenn du einen neuen Beitrag verfasst, werden die Aspekte, die du in der Liste ausgewählt hast, automatisch auch im Aspektwähler ausgewählt."
+      post_multiple_aspects_a: "Ja. Benutze dazu, wenn du einen Beitrag erstellst, die Aspekt-Auswahlschaltfläche um Aspekte an- oder abzuwählen. Die Standardauswahl ist „Alle Aspekte“. Dein Beitrag wird wird für alle Aspekte, die du auswählst, sichtbar sein. Außerdem kannst du die Aspekte, mit denen du teilen willst, in der Seitenleiste auswählen. Wenn du einen neuen Beitrag verfasst, werden die Aspekte, die du in der Liste ausgewählt hast, automatisch auch im Aspektwähler ausgewählt."
       post_multiple_aspects_q: "Kann ich einen Beitrag in mehreren Aspekten gleichzeitig erstellen?"
       remove_notification_a: "Nein. Sie werden auch nicht benachrichtigt, wenn du sie zu mehr Aspekten hinzufügst, während du schon mit ihnen teilst."
       remove_notification_q: "Wird ein Kontakt informiert, wenn ich ihn aus einem oder mehreren Aspekten entferne?"
-      rename_aspect_a: "Klicke in der Stream-Ansicht in der Seitenleiste auf „Meine Aspekte” und dann auf das Stiftsymbol bei dem Aspekt, den du umbenennen möchtest, oder gehe zu deiner „Kontakte”-Seite und wähle den entsprechenden Aspekt aus. Klicke dann auf das Bearbeitungssymbol neben dem Aspektnamen oben auf der Seite, ändere den Namen und klicke auf „Ändern”."
+      rename_aspect_a: "Klicke in der Stream-Ansicht in der Seitenleiste auf „Meine Aspekte“ und dann auf das Stiftsymbol bei dem Aspekt, den du umbenennen möchtest, oder gehe zu deiner „Kontakte“-Seite und wähle den entsprechenden Aspekt aus. Klicke dann auf das Bearbeitungssymbol neben dem Aspektnamen oben auf der Seite, ändere den Namen und klicke auf „Ändern“."
       rename_aspect_q: "Wie benenne ich einen Aspekt um?"
       restrict_posts_i_see_a: "Ja. Klicke dazu in der Seitenleiste erst auf „Meine Aspekte“ und anschließend auf einzelne Aspekte, um diese aus- oder abzuwählen. Anschließend werden nur noch Beiträge von Personen aus den ausgewählten Aspekten im Stream angezeigt werden."
       restrict_posts_i_see_q: "Kann ich angezeigte Beiträge in meinem Stream auf bestimmte Aspekte beschränken?"
       title: "Aspekte"
       what_is_an_aspect_a: "Um deine Kontakte in diaspora* in Gruppen einzuteilen, kannst du Aspekte anlegen. Zum Beispiel kannst du einen Aspekt für die Leute aus deiner Arbeit, einen für die Leute aus deiner Familie und einen für deine Freunde verwenden."
       what_is_an_aspect_q: "Was sind Aspekte?"
-      who_sees_post_a: "Wenn du einen begrenzten Beitrag postest, wird dieser nur für Leute sichtbar sein, die sich in dem ausgewählten Aspekt (oder in den ausgewählten Aspekten, falls du mehrere ausgewählt hast) befinden. Deine anderen Kontakte werden ihn nicht sehen, es sei denn, du machst ihn öffentlich. Ausschließlich öffentliche Beiträge werden auch für Leute sichtbar sein, die sich in keinem deiner Aspekte befinden."
+      who_sees_post_a: "Wenn du einen begrenzten Beitrag erstellst, wird dieser nur für Leute sichtbar sein, die du dem ausgewählten Aspekt (oder den ausgewählten Aspekten, falls du mehrere ausgewählt hast) vor dem Erstellen des Beitrags hinzugefügt hast. Kontakte, die du hast, die aber nicht in dem Aspekt sind, haben keine Möglichkeit den Beitrag zu sehen. Begrenzte Beiträge werden nie für Leute sichtbar sein, die du nicht einem deiner Aspekte hinzugefügt hast."
       who_sees_post_q: "Wenn ich einen Beitrag an einen Aspekt poste, wer sieht ihn dann?"
     chat:
       add_contact_roster_a: "Zuerst musst du den Chat für einen der Aspekte aktivieren, in denen sich die Person befindet. Dafür gehst du zur %{contacts_page}, wählst den gewünschten Aspekt aus und klickst auf das Chat-Icon, um den Chat für den Aspekt zu aktivieren. %{toggle_privilege} Wenn es dir lieber ist, kannst du auch einen speziellen Aspekt namens 'Chat' erstellen und zu ihm die Leute hinzufügen, mit denen du chatten willst. Wenn du damit fertig bist, öffnest du die Chatoberfläche und wählst die Person aus, mit der du chatten willst."
@@ -412,11 +412,11 @@ de:
       title: "Tastenkürzel"
     markdown: "Markdown"
     mentions:
-      how_to_mention_a: "Tippe das \"@\"-Zeichen und beginne, den zu erwähnenden Namen einzugeben. Ein Dropdown-Menü sollte erscheinen, um das Einfügen zu erleichtern. Beachte, dass du nur Leute erwähnen kannst, die du zu einem deiner Aspekte hinzugefügt hast."
+      how_to_mention_a: "Tippe das „@“-Zeichen und beginne, den zu erwähnenden Namen einzugeben. Ein Dropdown-Menü sollte erscheinen, um das Einfügen zu erleichtern. Beachte, dass du nur Leute erwähnen kannst, die du zu einem deiner Aspekte hinzugefügt hast."
       how_to_mention_q: "Wie erwähne ich jemand in einem Beitrag?"
       mention_in_comment_a: "Nein, momentan nicht."
       mention_in_comment_q: "Kann ich in den Kommentaren jemanden erwähnen?"
-      see_mentions_a: "Ja, klicke dazu in der linken Spalte deiner Startseite auf \"Erwähnungen\"."
+      see_mentions_a: "Ja, klicke dazu in der linken Spalte deiner Startseite auf „@Erwähnungen“."
       see_mentions_q: "Gibt es eine Möglichkeit, Beiträge zu finden, in denen ich erwähnt wurde?"
       title: "Erwähnungen"
       what_is_a_mention_a: "Eine Erwähnung ist ein Link zu der Profilseite einer Person, der in einem Beitrag erscheint. Wenn jemand erwähnt wird, erhält er eine Benachrichtigung, die seine Aufmerksamkeit auf den Beitrag lenkt."
@@ -470,7 +470,7 @@ de:
       stream_full_of_posts_a1: "Dein Stream ist zusammengesetzt aus drei Arten von Beiträgen:"
       stream_full_of_posts_li1: "Beiträge von Leuten, mit denen du teilst, von denen es zwei Arten gibt: Öffentliche Beiträge und begrenzte Beiträge, die mit einem Aspekt geteilt wurden, in dem du dich befindest. Um diese Beiträge aus deinem Stream zu entfernen, höre einfach auf, mit den jeweiligen Leuten zu teilen."
       stream_full_of_posts_li2: "Öffentliche Beiträge, die Tags enthalten, denen du folgst. Um diese zu entfernen, musst du aufhören den entsprechenden Tags zu folgen."
-      stream_full_of_posts_li3: "Öffentliche Posts von Leuten die im \"Gemeinschafts-Schaukasten\" gelisted sind. Diese können durch abwählen der \"Zeige Gemeinschafts-Schaukasten im Stream\"-Option im Konto-Tab in den Einstellungen entfernt werden."
+      stream_full_of_posts_li3: "Öffentliche Beiträge von Leuten, die im „Gemeinschafts-Schaukasten“ gelistet sind. Diese können durch Abwählen der Option „‚Gemeinschafts-Schaukasten‘ im Stream anzeigen“ im Konto-Tab deiner Einstellungen entfernt werden."
       stream_full_of_posts_q: "Warum ist mein Stream voll mit Beiträgen von Leuten, die ich nicht kenne und mit denen ich nicht teile?"
       title: "Beiträge und Posten"
     private_posts:
@@ -521,7 +521,7 @@ de:
       title: "Beiträge weitersagen."
     sharing:
       add_to_aspect_a1: "Nehmen wir an, dass Amy Ben zu einem ihrer Aspekten hinzufügt, aber Ben Amy (noch) nicht hinzugefügt hat:"
-      add_to_aspect_a2: "Dies ist als asymmetrisches Teilen bekannt. Wenn Ben Amy ebenfalls zu einem seiner Aspekte hinzufügt, wird es gegenseitiges Teilen, und sowohl Bens als auch Amys öffentliche, sowie private Beiträge, erscheinen im Stream des jeweils Anderen, etc. "
+      add_to_aspect_a2: "Das nennt man asymmetrisches Teilen. Wenn Ben allerdings Amy ebenfalls zu einem seiner Aspekte hinzufügt, wird es zu gegenseitigem Teilen. Es erscheinen also sowohl bei Ben als auch bei Amy die Beiträge, die die jeweils andere mit ihnen geteilt hat, im Stream. Amy kann nun auch Bens privates Profil einsehen. Außerdem können sie sich nun gegenseitig private Nachrichten senden."
       add_to_aspect_li1: "Ben wird eine Benachrichtigung erhalten, dass Amy angefangen hat mit ihm zu teilen."
       add_to_aspect_li2: "Amy sieht nun Bens öffentliche Beiträge in ihrem Stream."
       add_to_aspect_li3: "Amy kann keine privaten Beiträge Bens sehen."
@@ -720,7 +720,7 @@ de:
   notifier:
     a_limited_post_comment: "Auf diaspora* gibt es einen neuen Kommentar zu einem begrenzten Beitrag."
     a_post_you_shared: "ein Beitrag."
-    a_private_message: "Auf diaspora* gibt eine neue Private Nachricht für dich."
+    a_private_message: "Du hast soeben eine private Nachricht auf diaspora* erhalten."
     also_commented:
       limited_subject: "Es gibt einen neuen Kommentar zu einem Beitrag, den du kommentiert hast."
     click_here: "Hier klicken"
@@ -734,24 +734,24 @@ de:
       body: |-
           Hallo %{name},
 
-          diaspora* hat einen Versuch, auf dein Konto zuzugreifen, erkannt, der eventuell unbefugt war. Um auszuschließen, dass deine Daten gefährdet werden, bist du abgemeldet worden. Mach dir keine Sorgen; Du kannst dich jetzt wieder sicher anmelden.
+          diaspora* hat einen Versuch, auf dein Konto zuzugreifen, erkannt, der eventuell unbefugt war. Um auszuschließen, dass deine Daten gefährdet werden, bist du abgemeldet worden. Mach dir keine Sorgen; du kannst dich jetzt wieder sicher anmelden.
 
           Eine Anfrage ist mit ungültigem oder fehlendem CSRF-Token gesendet worden. Das könnte vollkommen harmlos sein, aber es könnte sich auch auch um einen Cross-Site-Request-Forgery-Angriff (CSRF-Angriff) handeln.
 
-          Das könnte verursacht worden sein von:
+          Das könnte verursacht worden sein durch:
 
-            - Einem Add-on, das die Anfrage manipuliert oder Anfragen ohne das Token durchführt;
-            - Einem offen gelassenen Tab aus einer früheren Sitzung;
-            - Einer anderen Website, die mit oder ohne deine Genehmigung Anfragen durchführt;
-            - Verschiedenen anderen externen Werkzeugen;
-            - Schädlichen Code, der versucht, auf deine Daten zuzugreifen.
+            - ein Add-on, das die Anfrage manipuliert oder Anfragen ohne das Token durchführt
+            - ein offen gelassenenes Tab aus einer früheren Sitzung
+            - eine andere Website, die mit oder ohne deine Genehmigung Anfragen durchführt
+            - verschiedene andere externe Werkzeuge
+            - schädlichen Code, der versucht, auf deine Daten zuzugreifen
 
           Für mehr Informationen zu CSRF, siehe [%{link}](%{link}).
 
           Falls du diese Nachricht wiederholt siehst, prüfe bitte die oben stehenden Punkte, einschließlich aller Browser-Add-ons.
 
-          Danke,
-          Der diaspora* E-Mail-Roboter!
+          Dir dankt
+          Der diaspora*-E-Mail-Roboter!
       subject: "Wir haben eine unbefugte Anfrage von deinem Konto empfangen, %{name}"
     email_sent_by_diaspora: "Diese E-Mail wurde von %{pod_name} verschickt. Falls du solche E-Mails nicht mehr erhalten willst,"
     export_email:
@@ -802,20 +802,19 @@ de:
 
           Du wurdest von %{diaspora_id} eingeladen, diaspora* beizutreten!
 
-          Klicke auf diesen Link, um loszulegen
+          Klicke auf folgenden Link, um loszulegen.
 
           [%{invite_url}][1]
 
-          Falls du bereits eine Konto hast, kannst du %{diaspora_id} zu deinen Kontakten hinzufügen.
+          Falls du bereits ein Konto besitzt, kannst du %{diaspora_id} zu deinen Kontakten hinzufügen.
 
-          Alles Liebe,
+          Alles Liebe
+          der diaspora*-E-Mail-Automat
 
-          der diaspora* E-Mail Roboter!
-
-          PS: Nur für den Fall, dass du (noch) nicht weißt, was diaspora* ist, [hier][2] gibt es die Antwort.
+          P.S. Nur für den Fall, dass du (noch) nicht weißt, was diaspora* ist: [Hier][2] erklären wir es dir.
 
           [1]: %{invite_url}
-          [2]%{diasporafoundation_url}
+          [2]: %{diasporafoundation_url}
     invited_you: "%{name} hat dich zu diaspora* eingeladen"
     liked:
       liked: "%{name} gefällt dein Beitrag"
@@ -826,7 +825,7 @@ de:
       subject: "%{name} hat dich auf diaspora* erwähnt"
     private_message:
       reply_to_or_view: "Antworte oder sieh dir diese Unterhaltung an >"
-      subject: "Es gibt eine neue private Nachricht für dich"
+      subject: "Neue private Nachricht"
     remove_old_user:
       body: |-
           Hallo,
@@ -1042,7 +1041,7 @@ de:
         other: "In %{count} Aspekten"
         zero: "In keinem Aspekt"
     invitations:
-      by_email: "Lade Leute per E-Mail ein"
+      by_email: "Einladung per E-Mail verschicken"
       invite_your_friends: "Lade deine Freunde ein"
       invites: "Einladungen"
       share_this: "Teile diesen Link per Email, Blog oder sozialen Netzwerken!"
@@ -1098,8 +1097,6 @@ de:
     total_users: "Gesamtzahl Benutzer"
     version: "Version"
   status_messages:
-    create:
-      success: "Erfolgreich erwähnt: %{names}"
     new:
       mentioning: "Erwähnt: %{person}"
     too_long: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen. Im Moment enthält er %{current_length} Zeichen"
@@ -1115,6 +1112,8 @@ de:
     aspects_stream: "Aspekte"
     comment_stream:
       title: "Kommentierte Beiträge"
+    commented:
+      title: "Kommentierte Beiträge"
     community_spotlight_stream: "Gemeinschafts-Schaukasten"
     followed_tag:
       add_a_tag: "Füge einen Tag hinzu"
@@ -1123,7 +1122,9 @@ de:
       title: "#Tags, denen du folgst"
     followed_tags_stream: "#Tags, denen du folgst"
     like_stream:
-      title: "\"Gefällt mir\"-Stream"
+      title: "„Gefällt mir“-Stream"
+    liked:
+      title: "Beiträge, die dir gefallen"
     mentioned_stream: "@Erwähnungen"
     mentions:
       title: "@Erwähnungen"
@@ -1177,7 +1178,7 @@ de:
       close_account_text: "Konto schließen"
       comment_on_post: "jemand deinen Beitrag kommentiert"
       current_password: "Derzeitiges Kennwort"
-      current_password_expl: "das mit dem Du dich anmeldest..."
+      current_password_expl: "das mit dem du dich anmeldest …"
       default_post_visibility: "Vorausgewählte Aspekte beim Erstellen von Beiträgen"
       download_export: "Mein Profil herunterladen"
       download_export_photos: "Meine Fotos herunterladen"
@@ -1198,7 +1199,7 @@ de:
       request_export_photos_update: "Meine Fotos aktualisieren"
       request_export_update: "Meine Profildaten aktualisieren"
       reshared: "jemand deinen Beitrag weitersagt"
-      show_community_spotlight: "„Gemeinschafts-Schaukasten” im Stream anzeigen"
+      show_community_spotlight: "„Gemeinschafts-Schaukasten“ im Stream anzeigen"
       show_getting_started: "Einstiegshinweise wieder aktivieren"
       someone_reported: "jemand einen Beitrag meldet"
       started_sharing: "jemand anfängt, mit dir zu teilen"
@@ -1210,7 +1211,7 @@ de:
       awesome_take_me_to_diaspora: "Super! Bring mich zu diaspora*"
       community_welcome: "diaspora*s Gemeinschaft ist froh, dich an Bord zu haben!"
       connect_to_facebook: "Wir können das Ganze etwas beschleunigen, indem du %{link}. So werden dein Name und dein Profilbild hier eingefügt und die Crossposting-Funktion aktiviert."
-      connect_to_facebook_link: "Dein Facebook-Konto mit diaspora* verlinkst"
+      connect_to_facebook_link: "dein Facebook-Konto mit diaspora* verknüpfst"
       hashtag_explanation: "Hashtags ermöglichen dir, über deine Interessen zu reden und ihnen zu folgen. Sie sind auch ein guter Weg, neue Leute bei diaspora* zu treffen!"
       hashtag_suggestions: "Probier mal Tags wie #kunst, #musik oder #gif zu folgen."
       well_hello_there: "Also, Hallöchen!"
@@ -1219,7 +1220,7 @@ de:
     privacy_settings:
       ignored_users: "Benutzer, die ignoriert werden"
       no_user_ignored_message: "Du ignorierst momentan keinen anderen Benutzer"
-      stop_ignoring: "Aufhören, zu ignorieren"
+      stop_ignoring: "Aufhören zu ignorieren"
       strip_exif: "Entferne Metadaten wie Ort, Autor und Kameramodell von hochgeladenen Bildern (empfohlen)"
       title: "Privatsphäre-Einstellungen"
     public:
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 430be664e..e76c08875 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -1090,8 +1090,6 @@ de_formal:
     total_users: "Gesamtzahl Benutzer"
     version: "Version"
   status_messages:
-    create:
-      success: "Erfolgreich erwähnt: %{names}"
     new:
       mentioning: "Erwähnt: %{person}"
     too_long: "Bitte kürzen Sie Ihren Beitrag auf weniger als %{count} Zeichen. Im Moment enthält er %{current_length} Zeichen"
@@ -1107,6 +1105,8 @@ de_formal:
     aspects_stream: "Aspekte"
     comment_stream:
       title: "Kommentierte Beiträge"
+    commented:
+      title: "Kommentierte Beiträge"
     community_spotlight_stream: "Gemeinschafts-Schaukasten"
     followed_tag:
       add_a_tag: "Fügen Sie einen Tag hinzu"
@@ -1116,6 +1116,8 @@ de_formal:
     followed_tags_stream: "#Tags, denen Sie folgen"
     like_stream:
       title: "„Gefällt mir”-Stream"
+    liked:
+      title: "Mit „Gefällt mir“ bewertete Beiträge"
     mentioned_stream: "@Erwähnungen"
     mentions:
       title: "Ihre Erwähnungen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 9c5012258..364f4d0c8 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -558,8 +558,6 @@ el:
       via: "Μέσω %{link}"
       via_mobile: "από κινητό"
   status_messages:
-    create:
-      success: "Αναφέρθηκαν επιτυχώς: %{names}"
     new:
       mentioning: "Αναφορά σε: %{person}"
     too_long: "Παρακαλώ μετέτρεψε το μήνυμα κατάστασης σου σε λιγότερους από %{count} χαρακτήρες. Τώρα είναι %{current_length} χαρακτήρες."
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 5f39babf3..af92ada77 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -523,8 +523,6 @@ en_1337:
       via: "V14 %{link}"
       via_mobile: "V14 M0B1L3"
   status_messages:
-    create:
-      success: "5UCC355FULLY M3N710N3D: %{names}"
     new:
       mentioning: "M3N710N1NG: %{person}"
     too_long: "{\"few\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"many\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"one\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R\\\"\", \"other\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"two\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\", \"zero\"=>\"PL3453 M4K3 Y0UR 5P4M5 L355 7H3N %{count} CH4R4C73R5\"}"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 40a00528a..00973b97b 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -500,8 +500,6 @@ en_pirate:
     message:
       default: "Blargh! Ye secret code didint match with the image ye scalawag!"
   status_messages:
-    create:
-      success: "Ye've successfully mentioned: %{names}"
     new:
       mentioning: "Mentionin': %{person}"
     too_long: "{\"few\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"many\"=>\"Ye scallywag,make yer status messages less than %{count} characters\", \"one\"=>\"Ye scallywag, make yer status messages less than %{count} character\", \"other\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"two\"=>\"Ye scallywag, make yer status messages less than %{count} characters\", \"zero\"=>\"Ye scallywag,make yer status messages less than %{count} characters\"}"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 0447b9517..64f541c76 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -366,8 +366,6 @@ en_shaw:
     stream_element:
       via: "𐑝𐑾 %{link}"
   status_messages:
-    create:
-      success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
     new:
       mentioning: "𐑥𐑧𐑯𐑖𐑩𐑯𐑦𐑙: %{person}"
     too_long: "{\"few\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"many\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"one\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼\", \"other\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\", \"two\"=>\"please make your status messages less than %{count} characters\", \"zero\"=>\"𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟\"}"
diff --git a/config/locales/diaspora/en_valspeak.yml b/config/locales/diaspora/en_valspeak.yml
index 3130299da..a96daf03a 100644
--- a/config/locales/diaspora/en_valspeak.yml
+++ b/config/locales/diaspora/en_valspeak.yml
@@ -927,8 +927,6 @@ en_valspeak:
     total_users: "Total ppl"
     version: "Ver"
   status_messages:
-    create:
-      success: "YAY! %{names} has been mentioned!! :D"
     new:
       mentioning: "Mentionin: %{person}"
     too_long: "Plz make ur status txt smaller than %{count} key presses. Right nao its like... %{current_length} key presses"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 566e1927f..0dc842994 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -526,8 +526,6 @@ eo:
       via: "per %{link}"
       via_mobile: "per poŝtelefono"
   status_messages:
-    create:
-      success: "Sukcese menciis: %{names}"
     new:
       mentioning: "Mencianta: %{person}"
     too_long: "{\"one\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\", \"other\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\", \"zero\"=>\"bonvolu igi viajn afiŝojn malpli longaj ol %{count} signoj\"}"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index a4cd70e96..acbdb8775 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -70,9 +70,9 @@ es-AR:
         one: "%{count} comentario"
         other: "%{count} comentarios"
         zero: "%{count} comentarios"
-      current_segment: "Este período tiente un promedio de <b>%{post_yest}</b> publicaciones por usuario, desde <b>%{post_day}</b>"
+      current_segment: "Este período tiente un promedio de %{post_yest} publicaciones por usuario, desde %{post_day}"
       daily: "Diario"
-      display_results: "Mostrando los resultados del período <b>%{segment}</b>"
+      display_results: "Mostrando los resultados del período %{segment}"
       go: "Ir"
       month: "Mes"
       posts:
@@ -83,7 +83,7 @@ es-AR:
         one: "Compartido %{count} vez"
         other: "Compartido %{count} veces"
         zero: "Compartido %{count} veces"
-      tag_name: "Nombre de la etiqueta: <b>%{name_tag}</b> Cantidad: <b>%{count_tag}</b>"
+      tag_name: "Nombre de la etiqueta: %{name_tag} Cantidad: %{count_tag}"
       usage_statistic: "Estadísticas de uso"
       users:
         one: "%{count} usuario"
@@ -222,6 +222,7 @@ es-AR:
       updating: "Actualizando"
     index:
       donate: "Donar"
+      donate_liberapay: "Donar a liberapay"
       help:
         any_problem: "¿Algún problema?"
         contact_podmin: "Contacta al administrador de tu pod!"
@@ -977,7 +978,7 @@ es-AR:
     comment_label: "<b>Comentario</b>: %{data}"
     confirm_deletion: "¿Está seguro de borrar el item?"
     delete_link: "Borrar item"
-    not_found: "<u>No se ha encontrado la publicación/comentario. ¡Al parecer ha sido borrada por el usuario!</u>"
+    not_found: "No se ha encontrado la publicación/comentario. ¡Al parecer ha sido borrada por el usuario!"
     post_label: "<b>Publicación</b>: %{content}"
     reason_label: "Motivo:"
     reported_label: "<b>Reportada por</b> %{person}"
@@ -1092,8 +1093,6 @@ es-AR:
     total_users: "Usuarios totales"
     version: "Versión"
   status_messages:
-    create:
-      success: "Se mencionó a: %{names}"
     new:
       mentioning: "Mencionar a: %{person}"
     too_long: "Por favor haz que tu mensaje de estado tenga menos de %{count} caracteres. En este momento el máximo permitido es de %{current_length} caracteres."
@@ -1109,6 +1108,8 @@ es-AR:
     aspects_stream: "Aspectos"
     comment_stream:
       title: "Posts Comentados"
+    commented:
+      title: "Posts comentados"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag:
       add_a_tag: "Añade una etiqueta"
@@ -1118,6 +1119,8 @@ es-AR:
     followed_tags_stream: "#Etiquetas que sigues"
     like_stream:
       title: "Tus preferidos"
+    liked:
+      title: "Posts con ''Me gusta''"
     mentioned_stream: "@Menciones"
     mentions:
       title: "@Menciones"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 7f9d962f4..6c72c73f3 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -664,8 +664,6 @@ es-CL:
       via: "vía %{link}"
       via_mobile: "vía celular"
   status_messages:
-    create:
-      success: "Se ha mencionado con éxito a: %{names}"
     new:
       mentioning: "Mencionar a: %{person}"
     too_long: "{\"few\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"many\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"one\"=>\"Tu mensaje de estado debe tener menos de %{count} caracter\", \"other\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\", \"two\"=>\"tu mensaje de estado tiene que tener menos de %{count} caracteres\", \"zero\"=>\"Tu mensaje de estado debe tener menos de %{count} caracteres\"}"
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index 0d0f21fc5..05125de4d 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -672,8 +672,6 @@ es-MX:
       user: "La imagen secreta y el código son distintos."
     placeholder: "Introduce el valor de la imagen"
   status_messages:
-    create:
-      success: "Se mencionó exitosamente a: %{names}"
     new:
       mentioning: "Mencionar a: %{person}"
     too_long: "{\"one\"=>\"por favor, haz que tu mensaje de estado tenga un carácter menos\", \"other\"=>\"por favor, haz que tu mensaje de estado tenga %{count} caracteres menos\", \"zero\"=>\"por favor, haz que tu mensaje de estado tenga %{count} caracteres menos\"}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index fe8fa16eb..bec9f279f 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -151,9 +151,17 @@ es:
         login_required: "Tienes que identificarte antes de autorizar esta aplicación"
         title: "¡Oh! Algo salió mal :("
       scopes:
+        aud:
+          description: ""
+        name:
+          name: "nombre"
+        nickname:
+          name: "apodo"
         openid:
           description: "Permite que la aplicación lea tu perfil básico"
           name: "perfil básico"
+        picture:
+          name: "fotografía"
         read:
           description: "Esto permite a la aplicación leer tu portada, tus conversaciones y tu perfil completo"
           name: "leer perfil, portada y conversaciones"
@@ -202,6 +210,7 @@ es:
       updating: "Actualizando"
     index:
       donate: "Donar"
+      donate_liberapay: "Donar a Liberapay"
       help:
         any_problem: "¿Algún problema?"
         contact_podmin: "¡Contacta con el administrador de tu pod!"
@@ -1023,8 +1032,6 @@ es:
     total_users: "Usuarios totales"
     version: "Versión"
   status_messages:
-    create:
-      success: "Se ha mencionado con éxito a: %{names}"
     new:
       mentioning: "Menciones: %{person}"
     too_long: "Por favor, pon un mensaje de estado menor de %{count} caracteres. Actualmente ocupa %{current_length} caracteres."
@@ -1040,6 +1047,8 @@ es:
     aspects_stream: "Aspectos"
     comment_stream:
       title: "Publicaciones comentadas"
+    commented:
+      title: "Publicaciones comentadas"
     community_spotlight_stream: "Lo más destacado"
     followed_tag:
       add_a_tag: "Añade una etiqueta"
@@ -1049,6 +1058,8 @@ es:
     followed_tags_stream: "#Etiquetas seguidas"
     like_stream:
       title: "Me gusta"
+    liked:
+      title: "Publicaciones que te han gustado"
     mentioned_stream: "@Menciones"
     mentions:
       title: "@Menciones"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 52863fa87..93050b4fa 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -507,8 +507,6 @@ eu:
       via: "%{link}(r)en bidez"
       via_mobile: "mugikorraren bidez"
   status_messages:
-    create:
-      success: "Arrakastaz aipatu dituzu: %{names}"
     new:
       mentioning: "Aipatzen: %{person}"
     too_long: "{\"few\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"many\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"one\"=>\"mesedez, egin itzazu zure mezuak karaktere %{count} baino motzagoak\", \"other\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\", \"two\"=>\"mesedez egin itzazu zure mezuak %{count} laraktere baino motzagoak\", \"zero\"=>\"mesedez, egin itzazu zure mezuak %{count} karaktere baino motzagoak\"}"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 581648e87..30977be67 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -915,8 +915,6 @@ fi:
     total_users: "Käyttäjiä yhteensä"
     version: "Versio"
   status_messages:
-    create:
-      success: "Onnistuneesti mainittu: %{names}"
     new:
       mentioning: "Mainitse: %{person}"
     too_long: "Sinun täytyy lyhentää tilapäivitystäsi, sillä se voi sisältää enimmillään %{count} merkkiä. Tällä hetkellä päivityksessäsi on %{current_length} merkkiä."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index a7fe74dc1..d67bcb21a 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -1078,8 +1078,6 @@ fr:
     total_users: "Total d'utilisateurs"
     version: "Version"
   status_messages:
-    create:
-      success: "Mention de : %{names}"
     new:
       mentioning: "Mentionne : %{person}"
     too_long: "Veillez à écrire un message de statut de %{count} caractères maximum. Il compte actuellement %{current_length} caractères."
@@ -1095,6 +1093,8 @@ fr:
     aspects_stream: "Aspects"
     comment_stream:
       title: "Messages commentés"
+    commented:
+      title: "Messages commentés"
     community_spotlight_stream: "Actualités de la communauté"
     followed_tag:
       add_a_tag: "Ajouter un tag"
@@ -1104,6 +1104,8 @@ fr:
     followed_tags_stream: "#Tags suivis"
     like_stream:
       title: "Flux des éléments aimés"
+    liked:
+      title: "Messages aimés"
     mentioned_stream: "@Mentions"
     mentions:
       title: "@Mentions"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 351406263..e51918d29 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -558,8 +558,6 @@ he:
       user: "הקוד והתמונה שונים"
     placeholder: "הזינו את הערך שבתמונה"
   status_messages:
-    create:
-      success: "אוזכרו בהצלחה: %{names}"
     new:
       mentioning: "אזכור: %{person}"
     too_long: "{\"one\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מתו אחד\", \"other\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים\", \"zero\"=>\"נא לקצר את הודעות הסטטוס שלך לפחות מ-%{count} תווים\"}"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 6fffadeb9..b5b988588 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -125,6 +125,8 @@ hu:
       user_applications:
         index:
           edit_applications: "Alkalmazások"
+          title: "Engedélyezett alkalmazások"
+        no_applications: "Nincsenek engedélyezett alkalmazásaid"
   are_you_sure: "Biztos vagy benne?"
   are_you_sure_delete_account: "Biztos, hogy törölni akarod a fiókodat? A törlés nem vonható vissza!"
   aspect_memberships:
@@ -719,7 +721,7 @@ hu:
     delete_link: "Elem törlése"
     not_found: "<u>A bejegyzés/hozzászólás nem található. Valószínűleg törölte a felhasználó.</u>"
     post_label: "<b>Bejegyzés</b>: %{title}"
-    reason_label: "Indok:"
+    reason_label: "Ok:"
     reported_label: "<b>Jelentette:</b> %{person}"
     review_link: "Átnézettnek jelöl"
     status:
@@ -751,6 +753,7 @@ hu:
       not_logged_in: "Jelenleg nem vagy bejelentkezve."
       really_disconnect: "%{service} kapcsolat leválasztása?"
       services_explanation: "Ha kapcsolódsz más szolgáltatásokhoz, lehetőséged lesz bejegyzéseket küldeni a felületükre, amint azokat a diaspora* rendszerén belül megírod."
+      title: "Kapcsolódó szolgáltatások kezelése"
     provider:
       facebook: "Facebook"
       tumblr: "Tumblr"
@@ -825,8 +828,6 @@ hu:
     total_users: "összes felhasználó"
     version: "változat"
   status_messages:
-    create:
-      success: "Megemlítetted: %{names}"
     new:
       mentioning: "Megemlít: %{person}"
     too_long: "Rövidíts. Az állapotfrissítésed nem lehet hosszabb %{count} leütésnél. Jelenleg %{current_length} karakterből áll"
@@ -898,6 +899,7 @@ hu:
       comment_on_post: "valaki hozzászólt egy bejegyzésedhez?"
       current_password: "Jelenlegi jelszó"
       current_password_expl: "amelyikkel bejelentkezel..."
+      default_post_visibility: "Alapértelmezett csoport az új bejegyzések számára"
       download_export_photos: "Képeim letöltése"
       edit_account: "Fiók szerkesztése"
       email_awaiting_confirmation: "Aktivációs link elküldve ide: %{unconfirmed_email}. Amíg nem erősíted meg az új címed, addig a régit használjuk: %{email}."
@@ -937,6 +939,7 @@ hu:
       ignored_users: "Mellőzött felhasználók"
       no_user_ignored_message: "Jelenleg nem mellőzöl más felhasználót"
       stop_ignoring: "Mellőzés feloldása"
+      strip_exif: "Metaadatok (hely, szerző és fényképezőgép modell) eltávolítása a feltöltött képekről (ajánlott)"
       title: "Adatvédelmi beállítások"
     public:
       does_not_exist: "%{username} nem létezik!"
diff --git a/config/locales/diaspora/hy.yml b/config/locales/diaspora/hy.yml
index 553b0f330..0c47f9dd2 100644
--- a/config/locales/diaspora/hy.yml
+++ b/config/locales/diaspora/hy.yml
@@ -921,7 +921,7 @@ hy:
     comment_label: "<b>Մեկնաբանություն</b>․<br>%{data}"
     confirm_deletion: "Համոզվա՞ծ ես, որ պետք է ջնջել սա։"
     delete_link: "Ջնջել սա"
-    not_found: "<u>Գրառումը/մեկնաբանությունը չգտնվեց։ Կարծես թե օգտատերը ջնջել է դա։<del></del></u>"
+    not_found: "Գրառումը/մեկնաբանությունը չգտնվեց։ Կարծես թե օգտատերը ջնջել է դա։"
     post_label: "<b>Գրառում</b>․ %{title}"
     reason_label: "Պատճառաբանությունը՝"
     reported_label: "<b>Բողոքողը՝</b> %{person}"
@@ -1029,8 +1029,6 @@ hy:
     total_users: "Ընդհանուր օգտատերեր"
     version: "Վարկած"
   status_messages:
-    create:
-      success: "Բարեհաջող նշվեց(ին)` %{names}"
     new:
       mentioning: "Նշում ես %{person}-ին"
     too_long: "Գրառումդ չպետք է գերազանցի %{count} նիշը։ Այն այժմ %{current_length} նիշից է բաղկացած։"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index b751b680b..2e1e57e6c 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -1027,8 +1027,6 @@ ia:
     total_users: "Total de usatores"
     version: "Version"
   status_messages:
-    create:
-      success: "Ha essite mentionate: %{names}"
     new:
       mentioning: "Mentiona: %{person}"
     too_long: "Per favor, non scribe plus de %{count} characteres in tu message de stato. In iste momento illo ha %{current_length} characteres."
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index fe31aa532..bf707add0 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -69,9 +69,9 @@ is:
   are_you_sure_delete_account: "Ertu viss um að þú viljir loka aðganginum þínum? Þetta er óafturkræf aðgerð!"
   aspect_memberships:
     destroy:
-      failure: "Ekki tókst að fjarlægja persónu af ásýnd"
-      no_membership: "Valda manneskjan fannst ekki í þeirri ásýnd"
-      success: "Það heppnaðist að fjarlægja persónu af ásýnd"
+      failure: "Ekki tókst að fjarlægja persónu af ásýnd."
+      no_membership: "Valda manneskjan fannst ekki í þeirri ásýnd."
+      success: "Það heppnaðist að fjarlægja persónu af ásýnd."
   aspects:
     add_to_aspect:
       failure: "Ekki tókst að bæta tengilið við ásýnd."
@@ -82,7 +82,7 @@ is:
       stay_updated: "Fylgstu með"
     destroy:
       failure: "%{name} er ekki hægt að fjarlægja."
-      success: "það heppnaðist að fjarlægja %{name}."
+      success: "Það heppnaðist að fjarlægja %{name}."
     edit:
       aspect_list_is_not_visible: "Tengiliðir í þessari ásýnd geta ekki séð hvern annan."
       aspect_list_is_visible: "Tengiliðir í þessari ásýnd geta séð hvern annan."
@@ -108,10 +108,11 @@ is:
         learn_more: "Vita meira"
         title: "Bjóða nýja notendur velkomna"
       services:
+        content: "Þú getur tengt eftirfarandi þjónustur við diaspora*:"
         heading: "Tengja þjónustur"
       welcome_to_diaspora: "Velkomin í Diaspora* %{name}!"
     no_contacts_message:
-      community_spotlight: "efst á baugi í samfélaginu"
+      community_spotlight: "Efst á baugi í samfélaginu"
       or_spotlight: "Eða þú getur deilt með %{link}"
       try_adding_some_more_contacts: "Þú getur leitað eða %{invite_link} fleiri tengiliðum."
       you_should_add_some_more_contacts: "Þú ættir að bæta við tengiliðum!"
@@ -134,10 +135,12 @@ is:
       commenting: "Athugasemd gerð..."
   contacts:
     index:
+      add_a_new_aspect: "Bæta við nýrri ásýnd"
       all_contacts: "Allir tengiliðir"
       community_spotlight: "Efst á baugi í samfélaginu"
       my_contacts: "Tengiliðirnir mínir"
       no_contacts: "No contacts."
+      no_contacts_message: "Skoðaðu %{community_spotlight}"
       start_a_conversation: "Hefja umræðu"
       title: "Tengiliðir"
     spotlight:
@@ -152,16 +155,17 @@ is:
     new:
       send: "Senda"
       sending: "Sendi..."
-      subject: "efni"
-      to: "til"
+      subject: "Efni"
+      to: "við"
     show:
+      delete: "Eyða samtali"
       reply: "svar"
       replying: "Svara..."
   date:
     formats:
       birthday: "%B %d"
-      birthday_with_year: "%d %B %Y"
-      fullmonth_day: "%d %B"
+      birthday_with_year: "%d. %B %Y"
+      fullmonth_day: "%d. %B"
   delete: "Eyða"
   email: "Netfang"
   error_messages:
@@ -190,7 +194,7 @@ is:
       whats_in_profile_a: "Ferilskráin, staðsetning, kyn og fæðingardagur.  Þetta eru allt hlutir sem eru neðst á Síðunni Þinni.  Þú ræður hvort þú setur upplýsingar þar inn.  Eingöngu einstaklingar sem þú hefur bætt í eina af þínum sýnum, og eru skráðir inn, geta séð þessar upplýsingar.  Þegar þeir fara á síðuna þína geta þeir séð þau skeyti sem þú hefur deilt með öllum, sem og þau skeyti sem þú hefur valið að deila með sýnum sem þeir eru í."
   invitations:
     create:
-      no_more: "Ekki eru til fleiri boðsmiðar."
+      no_more: "Ekki eru fleiri boðsmiðar."
       rejected: "Eftirfarandi netföng ollu vandræðum: "
       sent: "Boðsmiðar hafa verið sendir til: %{emails}"
     new:
@@ -202,6 +206,7 @@ is:
     application:
       back_to_top: "Fara efst"
       powered_by: "Keyrt með díaspora*"
+      public_feed: "Opinbert diaspora*-streymi fyrir %{name}"
       toggle: "Víxla farsímavef af/á"
       whats_new: "Hvað er að frétta?"
     header:
@@ -322,7 +327,7 @@ is:
           [1]: %{invite_url}
           [2]: %{diasporafoundation_url}
     liked:
-      liked: "%{name} has just liked your post: "
+      liked: "%{name} líkaði við færsluna þína"
       view_post: "Skoða færslu >"
     mentioned:
       subject: "%{name} hefur getið þín á Diaspora*"
@@ -340,7 +345,7 @@ is:
     add_contact:
       invited_by: "Þér var boðið af"
     index:
-      no_one_found: "...og enginn fannst."
+      no_one_found: "...og ekkert fannst."
       no_results: "Hey! Þú þarft að leita að einhverju."
       results_for: "Notendur sem samsvara %{search_term}"
     person:
@@ -351,6 +356,7 @@ is:
       gender: "Kyn"
       location: "Staðsetning"
     show:
+      closed_account: "Þessum aðgangi hefur verið lokað."
       does_not_exist: "Manneskjan er ekki til!"
   photos:
     create:
@@ -367,6 +373,7 @@ is:
         one: "Ein mynd frá %{author}"
         other: "%{count} myndir frá %{author}"
         zero: "Engar myndir frá %{author}"
+      reshare_by: "Endurdeilt af %{author}"
   privacy: "Gagnaleynd"
   profile: "Síðan mín"
   profiles:
@@ -405,6 +412,7 @@ is:
   reshares:
     reshare:
       reshare_confirmation: "Endurdeila frá %{author}?"
+      reshared_via: "Endurdeilt með"
   search: "Leita"
   services:
     create:
@@ -455,6 +463,8 @@ is:
       title: "Ásýndirnar þínar"
     aspects_stream: "Ásýndir"
     community_spotlight_stream: "Efst á baugi í samfélaginu"
+    followed_tag:
+      follow: "Fylgjast með"
   tags:
     show:
       follow: "Fylgjast með #%{tag}"
@@ -472,9 +482,11 @@ is:
       change_password: "Breyta lykilorði"
       close_account:
         what_we_delete: "We delete all of your posts, profile data, as soon as humanly possible. Your comments will hang around, but be associated with your Diaspora Handle."
+      close_account_text: "Loka aðgangi"
       current_password: "Núverandi lykilorð"
       edit_account: "Breyta notandastillingum"
       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}."
+      export_data: "Flytja út gögn"
       new_password: "Nýtt lykilorð"
       receive_email_notifications: "Fá tilkynningar í tölvupósti þegar:"
       your_email: "Netfangið þitt"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 315056b51..1976e1174 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -722,8 +722,6 @@ it:
       user: "L'immagine segreta e il codice non coincidono"
     placeholder: "Inserisci il valore dell'immagine"
   status_messages:
-    create:
-      success: "Menzionati con successo: %{names}"
     new:
       mentioning: "Stai menzionando: %{person}"
     too_long: "Per favore, commenta con meno di %{count} carattere. Al momento sono %{current_length} caratteri"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 30944ce25..21a95309b 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -1053,8 +1053,6 @@ ja:
     total_users: "合計ユーザー数"
     version: "バージョン"
   status_messages:
-    create:
-      success: "%{names}を参照するのに成功しました。"
     new:
       mentioning: "%{person}さんのメンション"
     too_long: |-
@@ -1072,6 +1070,8 @@ ja:
     aspects_stream: "アスペクト"
     comment_stream:
       title: "コメントした投稿"
+    commented:
+      title: "コメントした投稿"
     community_spotlight_stream: "コミュニティスポットライト"
     followed_tag:
       add_a_tag: "タグを追加する"
@@ -1081,6 +1081,8 @@ ja:
     followed_tags_stream: "フォローしたタグ"
     like_stream:
       title: "ストリーム、いいね！"
+    liked:
+      title: "いいね！した投稿"
     mentioned_stream: "@メンション"
     mentions:
       title: "@メンション"
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index 36e798239..bbaa2c4af 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -427,8 +427,6 @@ ka:
     stream_element:
       via: "via %{link}"
   status_messages:
-    create:
-      success: "წარმატებით აღნიშნე: %{names}"
     new:
       mentioning: "Mentioning: %{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\"}"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index ff656e4cd..88b64717e 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -534,8 +534,6 @@ ko:
       via: "%{link}에서"
       via_mobile: "via 모바일"
   status_messages:
-    create:
-      success: "%{names}님을 성공적으로 멘션했습니다."
     new:
       mentioning: "%{person}님을 멘션합니다"
     too_long: "{\"other\"=>\"상태 메시지를 %{count}자보다 적게 줄여주세요\", \"zero\"=>\"상태 메시지를 %{count}자보다 적게 줄여주세요\"}"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 40bb74413..a66e9dcc3 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -636,8 +636,6 @@ ml:
       via: "via %{link}"
       via_mobile: "മൊബൈൽ ഉപയോഗിച്ച്"
   status_messages:
-    create:
-      success: "വിജയകരമായി സൂചിപ്പിച്ചു: %{names}"
     new:
       mentioning: "സൂചിപ്പിക്കുന്നു: %{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\"}"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 9231a6220..9b4b8bc10 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -934,8 +934,6 @@ nb:
     total_users: "Totalt antall brukere"
     version: "Versjon"
   status_messages:
-    create:
-      success: "Nevnte :%{navn}"
     new:
       mentioning: "Nevner: %{person}"
     too_long: "{\"few\"=>\"du bør begrense statusmeldingene dine til %{count} tegn\", \"many\"=>\"Du bør begrense statusmeldingene dine til %{count} characters\", \"one\"=>\"du bør begrense statusmeldingene dine til %{count} tegn\", \"other\"=>\"du må gjøre statusmeldingene dine kortere enn %{count} tegn\", \"two\"=>\"vær så snill og skriv statusoppdateringer som er under %{count} tegn\", \"zero\"=>\"Statusmeldinger må være lengre enn ingenting.\"}"
diff --git a/config/locales/diaspora/nds.yml b/config/locales/diaspora/nds.yml
index b7272a19a..bd3a0c38b 100644
--- a/config/locales/diaspora/nds.yml
+++ b/config/locales/diaspora/nds.yml
@@ -720,8 +720,6 @@ nds:
     total_users: "Bruker insgesamt"
     version: "Version"
   status_messages:
-    create:
-      success: "Erfolgriek erwähnt: %{names}"
     new:
       mentioning: "Erwähn: %{person}"
     too_long: "Bidde mok dien Bidrag kötter as %{count} Teken. In Moment is he %{current_length} Teken lang"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 8a75dd08f..fc9871d75 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -1072,8 +1072,6 @@ nl:
     total_users: "Aantal gebruikers"
     version: "Versie"
   status_messages:
-    create:
-      success: "Succesvol vermeld: %{names}"
     new:
       mentioning: "Noem: %{person}"
     too_long: "Zorg ervoor dat je statusbericht korter is dan %{count} tekens. Nu is het %{current_length} tekens lang"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 1d137ea9d..469e6ab79 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -524,8 +524,6 @@ nn:
       via: "via %{link}"
       via_mobile: "via mobiltelefon"
   status_messages:
-    create:
-      success: "Nemnde: %{names}"
     new:
       mentioning: "Nemner: %{person}"
     too_long: "{\"few\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"many\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"one\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"other\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"two\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\", \"zero\"=>\"sjå til at statusmeldingane dine har færre enn %{count} teikn\"}"
diff --git a/config/locales/diaspora/oc.yml b/config/locales/diaspora/oc.yml
index 5ab8b57ac..e34ae2c85 100644
--- a/config/locales/diaspora/oc.yml
+++ b/config/locales/diaspora/oc.yml
@@ -270,7 +270,7 @@ oc:
       failure: "Ai pas pogut quitar d'ignorar aqueste utilizaire. #evasion"
       success: "Vejam çò qu'an a dire ! #digatzbonjorn"
   bookmarklet:
-    explanation: "Publicatz sus diaspora* d'ont que siá en apondent %{link} a vòstres marcapaginas."
+    explanation: "Publicatz sus diaspora* d'ont que siá en apondent aqueste ligam => %{link}."
     heading: "Publicacion rapida"
     post_something: "Publicatz sus diaspora*"
   cancel: "Anullar"
@@ -430,6 +430,7 @@ oc:
       diaspora_app_q: "Existís una aplicacion diaspora* per Android o iOS ?"
       photo_albums_a: "Pas pel moment. Pasmens, podètz veire los imatges mandats d'una persona dins l'onglet Fòtos de lor pagina de perfil."
       photo_albums_q: "I a d'albums de fòtos o de vidèos ?"
+      subscribe_feed_a: "Òc, mai es pas encara una foncion lustrada e lo format dels resultats es totjorn un pauc brut. S'avètz enveja d'ensajar aquò, anatz sus la pagina de perfil de qualqu'un e clicatz sul boton de flux dins vòstre navigador, o podètz copiar l'URL del perfil (ex. https://nomdelpod.org/mond/unnumero) e pegatz aquò dins un lector de flux. L'adreça del flux semblarà a aquò :  https://podname.org/public/username.atom – diaspora* utiliza Atom e non pas RSS."
       subscribe_feed_q: "Me pòdi inscriure als messatges publics d'una persona amb un lector de fluxes ?"
       title: "Divèrs"
     pods:
@@ -438,11 +439,14 @@ oc:
       title: "Pods"
       use_search_box_a: "Se coneissètz lor ID diaspora* complet (ex. : utilizaire@nomdelpod.org), podètz los trobar en los cercant. Se sètz sul meteis servidor, podètz los trobar sonque amb los noms d'utilizaire. Autrament podètz los cercar amb lor nom de perfil (lo nom que vesètz sus l'ecran). Se una recèrca capita pas lo primièr còp, tornatz ensajar."
       use_search_box_q: "Cossí me cal utilizar lo camp de recèrca per trobar qualqu'un en particular ?"
+      what_is_a_pod_a: "Un pod es un servidor qu’executa lo programa diaspora* e qu’es connectat al malhum diaspora*. « Pod » es una metafòra que fa referéncia a l'anglés, que significa dòlça, perque conten de grans coma lo servidor que conten de comptes d'utilizaires. I a un melon de pods. Podètz apondre d’amics d’autres pods e comunicar amb eles. Cal pas dobrir de compte suls diferents pods ! Cal pas qu’un compte – d’aquel biais podètz pensar un pod coma un fornisseire de corrièls. I a de pods publics, de pods privats, e amb un bocin d’esfòrces podètz aver lo vòstre."
       what_is_a_pod_q: "Qu'es aquò un pod ?"
     posts_and_posting:
+      char_limit_services_a: "En aquel cas deuriatz restrénher vòstras publicacions al nombre de caractèrs autorizats pel servici (140 per Twitter, 1000 per Tumblr), lo nombre de caractèrs demòran s’aficharà se l’icòna del servici es seleccionada. Podètz pr’aquò escriure de tèxtes mai grands, mai lo tèxte serà talhat e un ligam plaçat cap a la publicacion sus diaspora*."
       char_limit_services_q: "Quin es lo limit de caractèrs pels messatges partejats amb un servici qu'a un limit de caractèrs mai pichon ?"
       character_limit_a: "65 535 caractèrs. Son 65 395 caractèrs de mai que Twitter ! :)"
       character_limit_q: "Qual es lo limit de caractèrs per las publicacions ?"
+      embed_multimedia_a: "Normalament pas cal pas que pegar l’URL (ex. http://www.youtube.com/watch?v=nnnnnnnnnnn) dins vòstra publicacion e la vidèo o l’àudio serà apondut automaticament. Aqueste site es compatible amb : YouTube, Vimeo, SoundCloud, Flickr e qualques mai. diaspora* emplega oEmbed per aquesta foncionalitat. Cada còp sèm compatibles amb mai sorgas de mèdias. Remembratz-vos de totjorn publicar l’URL completa – pas cap de ligams acorchits – e esperatz un momenton abans d’actualizar la pagina aprèp aver publicat per tal de veire l’ulhada."
       embed_multimedia_q: "Cossí pòdi inserir un contengut vidèo, àudio, o multimèdia dins una publicacion ?"
       format_text_a: "N'emplegant un sistèma simplifiat apelat %{markdown}. Podètz trapar tota la sintaxi de Markdown %{here}. Lo boton d'apercebut pòt èsser de bona ajuda, permet de veire vòstre messatge coma serà afichat abans de o partejar."
       format_text_q: "Cossí pòdi formatar lo tèxte dins as publicacions (gras, italic, etc.) ?"
@@ -485,6 +489,7 @@ oc:
       who_sees_post_q: "Quand mandi un messatge a un aspècte (es a dire un messatge privat), qual o pòt veire ?"
     private_profiles:
       title: "Perfils privats"
+      whats_in_profile_a: "Vòstre perfil privat conten vòstra biografia, emplaçament, gendre, e data d’anniversari s’avètz garnit aquelas seccions. Totas aquelas informacions son opcionalas – causissètz o pas de las fornir. Lo mond connectats al site e qu’avètz aponduts a vòstres aspèctes son los solets a poder veire vòstre perfil privat. Quand visitan vòstra pagina de perfil veiràn tanben vòstras publicacions privadas ligadas al(s) aspèctes ont son, mescladas a vòstras publicacions publicas."
       whats_in_profile_q: "Qu'es aquò mon perfil privat ?"
       who_sees_profile_a: "Solament los utilizaires connectats e que partejatz amb eles (vòl dire, qu'avètz apondut a un de vòstres aspèctes). Pasmens, lo mond que vos sèc, mai que seguètz pas, veiràn pas que vòstras informacions publicas."
       who_sees_profile_q: "Qual pòt veire mon perfil privat ?"
@@ -493,7 +498,9 @@ oc:
     public_posts:
       can_comment_reshare_like_a: "Quin utilizaire connectat a diaspora* que siá, pòt comentar, repartejar vòstre messatge public o marcar que li agrada."
       can_comment_reshare_like_q: "Qual pòt comentar, repartejar, o marcar que li agrada mon messatge public ?"
+      deselect_aspect_posting_a: "Deseleccionar d’aspèctes càmbia pas res per las publicacions publicas. Demoraràn publicas e apareisseràn dins lo flux d’actualitat de vòstres contactes. Per far venir visibla una publicacion dins un aspècte especific, vos cal seleccionar los aspèctes al moment de publicar sul selector d’aspècte jos l’editor."
       deselect_aspect_posting_q: "Qué passa quand deseleccioni un o mai aspèctes al moment d'escriure una publicacion publica ?"
+      find_public_post_a: "Vòstras publicacions publicas apareisseràn dins lo flux d’actualitat de qual que siá que vos sèc. S’ajustatz unas #etiquetas a vòstra publicacion, qual que siá que sèc aquelas etiquetas trobarà vòstra publicacion dins lor flux. Totas las publicacions publicas an una URL especifica que tot lo mond pòdon veire, amai se son pas connectats – doncas las publicacions publicas pòdon èsser ligadas directament de Twitter, blogs, etc. Los robòts de recèrca pòdon tanben las indexar."
       find_public_post_q: "Cossí las autras personas pòdon trobar mos messatges publics ?"
       see_comment_reshare_like_a: "Los comentaris, mencions \"m'agrada\", e repartiments de publicacions publicas son tanben publics. Tot utilizaire connectat dins diaspora* e qual que siasgue d'Internet pòt veire vòstras interaccions amb una publicacion publica."
       see_comment_reshare_like_q: "Quand comenti, tòrni partejar, o aimi una publicacion publica, qual pòt o veire ?"
@@ -540,6 +547,7 @@ oc:
     tags:
       filter_tags_a: "Aquesta foncion es pas directament disponibla dins diaspora*, mai unes %{third_party_tools} son estats escrichs per far o."
       filter_tags_q: "Cossí pòdi filtrar/exclure certans tags de mon flux ?"
+      followed_tags_a: "Aprèp aver cercat una etiqueta podètz clicar sul boton amont de la pagina de las etiquetas per « seguir »aquesta etiqueta. Apareisserà dins vòstre lista d’etiquetas seguidas sul menú a man drecha. En clicant sus una de vòstras etiquetas seguidas aquò vos menarà sus la pagina d’aquesta etiqueta per veire las publicacions recentas que contenon aquesta etiqueta. Clicatz sus #Etiquetas seguidas per veire un flux de publicacions que contenon totes las etiquetas que seguissètz."
       followed_tags_q: "De qué son los \"#Tags Seguits\" e cossí pòdi seguir un tag ?"
       people_tag_page_a: "I a monde qu'an listat aqueste tag per se descriure eles-meteisses dins lor perfil public."
       people_tag_page_q: "Qualas son las personas listadas sus la partida d'esquèrra d'una pagina de tag ?"
@@ -663,9 +671,9 @@ oc:
       show_unread: "Afichar los que son pas legits"
       started_sharing: "A començat de partejar"
     liked:
-      one: "Vòstra publicacion %{post_link} agrada a %{actors} persona."
-      other: "Vòstra publicacion %{post_link} agrada a %{actors} personas."
-      zero: "Vòstra publicacion %{post_link} agrada a %{actors} persona."
+      one: "Vòstra publicacion %{post_link} agrada a %{actors}."
+      other: "Vòstra publicacion %{post_link} agrada a %{actors}."
+      zero: "Vòstra publicacion %{post_link} agrada a %{actors}."
     liked_post_deleted:
       one: "Vòstra publicacion suprimida a pas agradat %{actors} persona."
       other: "Vòstra publicacion suprimida a pas agradat %{actors} personas."
@@ -710,7 +718,7 @@ oc:
       subject: "Mercés d'activar vòstre novèl corrièl %{unconfirmed_email}"
     csrf_token_fail:
       subject: "Avèm recebut una demanda sens autorizacion de vòstre compte, %{name}"
-    email_sent_by_diaspora: "Aqueste corrièl es estat mandaat per %{pod_name}. Se volètz pas mai de corrièls atal,"
+    email_sent_by_diaspora: "Aqueste corrièl es estat mandat per %{pod_name}. Se volètz pas mai de corrièls atal,"
     export_email:
       body: |-
           Bonjorn %{name},
@@ -1052,8 +1060,6 @@ oc:
     total_users: "Total d'utilizaires"
     version: "Version"
   status_messages:
-    create:
-      success: "Mencion de : %{names}"
     new:
       mentioning: "Menciona : %{person}"
     too_long: "Avisatz-vos d'escriure un messatge d'estatut de %{count} caractèrs maximum. Compta actualament %{current_length} caractèrs."
@@ -1069,6 +1075,8 @@ oc:
     aspects_stream: "Aspèctes"
     comment_stream:
       title: "Publicacions comentadas"
+    commented:
+      title: "Publicacions comentadas"
     community_spotlight_stream: "Actualitat de la comunitat"
     followed_tag:
       add_a_tag: "Apondre una etiqueta"
@@ -1078,6 +1086,8 @@ oc:
     followed_tags_stream: "#Etiquetas seguidas"
     like_stream:
       title: "Flux dels elements qu'agradan"
+    liked:
+      title: "Publicacions aimadas"
     mentioned_stream: "@Mencions"
     mentions:
       title: "@Mencions"
@@ -1142,7 +1152,7 @@ oc:
       export_photos_in_progress: "Sèm a tractar vòstras fòtos. Tornatz aicí dins un momenton."
       following: "Paramètres de partiment"
       last_exported_at: "(Darrièra mesa a jorn a %{timestamp})"
-      liked: "A qualqu'un li a agradat vòstra publicacion"
+      liked: "a qualqu'un li a agradat vòstra publicacion"
       mentioned: "...se vos menciona dins un messatge."
       new_password: "Senhal novèl"
       private_message: "Avètz recebut un messatge privat."
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 15e9a4827..a84e03820 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -989,8 +989,6 @@ pl:
     total_users: "W sumie użytkowników"
     version: "Wersja"
   status_messages:
-    create:
-      success: "Pomyślnie wspomniano o: %{names}"
     new:
       mentioning: "Wspominasz o: %{person}"
     too_long: "Skróć swój status do mniej niż %{count} znaków. Obecnie jej długość to %{current_length} znaków."
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 42d7501c4..c64f1663b 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -1075,8 +1075,6 @@ pt-BR:
     total_users: "Total de usuários"
     version: "Versão"
   status_messages:
-    create:
-      success: "Mencionados com sucesso: %{names}"
     new:
       mentioning: "Mencionando: %{person}"
     too_long: "Sua mensagem de status deve ter menos de %{count} caracteres. Agora, ela tem %{current_length} caracteres."
@@ -1092,6 +1090,8 @@ pt-BR:
     aspects_stream: "Aspectos"
     comment_stream:
       title: "Publicações comentadas"
+    commented:
+      title: "Publicações comentadas"
     community_spotlight_stream: "Destaque da Comunidade"
     followed_tag:
       add_a_tag: "Adicionar uma tag"
@@ -1101,6 +1101,8 @@ pt-BR:
     followed_tags_stream: "#Seguindo Tags"
     like_stream:
       title: "Publicações curtidas"
+    liked:
+      title: "Publicações curtidas"
     mentioned_stream: "@Menções"
     mentions:
       title: "@Menções"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index dcb71def8..8ea7247e9 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -652,8 +652,6 @@ pt-PT:
       via: "Via %{link}"
       via_mobile: "Via telemóvel"
   status_messages:
-    create:
-      success: "Mencionou com sucesso: %{names}"
     new:
       mentioning: "A mencionar: %{person}"
     too_long: "Por favor, não utilize mais de %{count} carateres nas suas mensagens de estado\". De momento tem %{current_length} carateres"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index f650ee011..37ac1cdf6 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -1000,8 +1000,6 @@ ru:
     total_users: "Всего пользователей"
     version: "Версия"
   status_messages:
-    create:
-      success: "Успешно упомянут: %{names}"
     new:
       mentioning: "Упоминание: %{person}"
     too_long: "Будьте добры, сократите ваше сообщение до %{count} символов. На данный момент сообщение составляет %{current_length} символов"
diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml
index 405c1dc46..dc8c07d75 100644
--- a/config/locales/diaspora/sc.yml
+++ b/config/locales/diaspora/sc.yml
@@ -110,9 +110,37 @@ sc:
   contacts:
     index:
       add_a_new_aspect: "Annanghe un'aspetu nou"
+      all_contacts: "Totu sos cuntatos"
+      community_spotlight: "In evidèntzia in sa comunidade"
+      my_contacts: "Cuntatos meos"
       no_contacts: "Paret chi tue tèngias bisòngiu de annànghere carchi cuntatu in prus!"
+      no_contacts_message: "Abbàida %{community_spotlight}"
+      only_sharing_with_me: "Cumpartzint petzi cun mie"
       start_a_conversation: "Incumintza un'arresonu"
       title: "Cuntatos"
+    spotlight:
+      community_spotlight: "In evidèntzia in sa comunidade"
+  conversations:
+    create:
+      fail: "Messàgiu non vàlidu"
+      sent: "Messàgiu imbiadu"
+    index:
+      inbox: "Casella de posta"
+      no_messages: "Perunu messàgiu"
+    new:
+      send: "Imbia"
+      sending: "Imbiende..."
+      subject: "Sugetu"
+      to: "A"
+    show:
+      delete: "Iscantzella s'arresonu"
+      reply: "Risponde"
+      replying: "Rispondende..."
+  date:
+    formats:
+      birthday: "%d de %B"
+      birthday_with_year: "%d %B %Y"
+      fullmonth_day: "%d de %B"
   delete: "Burra"
   email: "P. eletr. (e-mail)"
   error_messages:
@@ -120,6 +148,24 @@ sc:
       correct_the_following_errors_and_try_again: "Currege custos errore e torra a proare."
   fill_me_out: "Iscrie inoghe"
   find_people: "Agata pessonas o #etichetas"
+  invitations:
+    create:
+      no_more: "Non tenes prus invitos."
+      rejected: "Custos indiritzos de posta eletrònica ant tentu problemas: %{emails}"
+      sent: "Sos invitos sunt istados imbiados a: %{emails}"
+    new:
+      invite_someone_to_join: "Invita calicunu a intrare in diaspora*!"
+      language: "Limba"
+      send_an_invitation: "Imbia un'invitu"
+  layouts:
+    application:
+      powered_by: "Suportadu dae diaspora*"
+      whats_new: "Ite b'est de nou?"
+    header:
+      code: "Còdighe"
+      logout: "Essi"
+      profile: "Profilu"
+      settings: "Impostatziones"
   limited: "Limitadu"
   more: "Àteru"
   no_results: "Perunu resurtadu agatadu"
@@ -141,6 +187,11 @@ sc:
   public: "Pùblicu"
   search: "Chirca"
   settings: "Impostatziones"
+  streams:
+    commented:
+      title: "Messàgios pùblicos cummentados"
+    liked:
+      title: "Messàgios pùblicos agradados"
   username: "Nùmene impitadore"
   users:
     edit:
diff --git a/config/locales/diaspora/si.yml b/config/locales/diaspora/si.yml
index eb462427b..bed392a0d 100644
--- a/config/locales/diaspora/si.yml
+++ b/config/locales/diaspora/si.yml
@@ -163,8 +163,6 @@ si:
     stream_element:
       via_mobile: "ජංගම දුරකථනය හරහා"
   status_messages:
-    create:
-      success: "සාර්ථක ලෙස සදහන්කරා: %{names}"
     new:
       mentioning: "සදහන්කරන්න: %{person}"
   username: "පරිශ්‍රීලක නම"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index b648ef126..78c9a3b71 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -629,8 +629,6 @@ sk:
       default: "Tajný kód nie je rovnaký ako ten na obrázku"
       user: "Tajný obrázok a kód sa odlišujú."
   status_messages:
-    create:
-      success: "Úspešne sa spomína: %{names}"
     new:
       mentioning: "Spomína sa: %{person}"
     too_long: "Prosím, skráť svoju správu v statuse na menej ako %{count} znakov. Momentálne má %{current_length} znakov."
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 973715dc7..a74cfe0f6 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -525,8 +525,6 @@ sl:
       via: "preko %{link}"
       via_mobile: "preko mobilnika"
   status_messages:
-    create:
-      success: "Uspešno omenjeni: %{names}"
     new:
       mentioning: "Omembe: %{person}"
     too_long: "{\"few\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znake\", \"one\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znak\", \"other\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov\", \"two\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znaka\", \"zero\"=>\"vaše spročilo o stanju morajo vsebovati manj kot %{count} znakov\"}"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index b2e777b5d..f48425f1b 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -1081,8 +1081,6 @@ sv:
     total_users: "Totala antalet användare"
     version: "Version"
   status_messages:
-    create:
-      success: "Lyckades nämna: %{names}"
     new:
       mentioning: "Nämner: %{person}"
     too_long: "Var god håll längden på meddelandet under %{count} tecken. Just nu är det %{current_length} tecken långt."
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index cd9af3e5f..04d692013 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -727,8 +727,6 @@ te:
     total_users: "మొత్తం వాడుకరులు"
     version: "రూపాంతరం"
   status_messages:
-    create:
-      success: "విజయవంతంగా పేర్కొన్నారు: %{names}"
     new:
       mentioning: "పేర్కోలు: %{person}"
     too_long: "{\"one\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\", \"other\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\", \"zero\"=>\"దయచేసి మీ స్థితి సందేశాలలో అక్షరాల సంఖ్య %{count} కంటే తక్కువ ఉండేటట్లు చూసుకోండి\"}"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5eeab798d..3199ea4ca 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -692,8 +692,6 @@ tr:
       user: "Gizli Resim ve kod farklıydı"
     placeholder: "Resimdeki değeri girin"
   status_messages:
-    create:
-      success: "Başarıyla bahsedildi: %{names}"
     new:
       mentioning: "Bahseden: %{person}"
     too_long: "{\"other\"=>\"durum mesajları %{count} karakterden az olmalıdır.\", \"zero\"=>\"durum mesajları %{count} karakterden az olmalıdır.\"}"
@@ -705,6 +703,8 @@ tr:
     aspects_stream: "Yönler"
     comment_stream:
       title: "Yorumlanan gönderiler"
+    commented:
+      title: "yorumladı mesajlar"
     community_spotlight_stream: "Topluluk Spotlight"
     followed_tag:
       add_a_tag: "Etiket ekle"
@@ -713,6 +713,8 @@ tr:
     followed_tags_stream: "#Takip Edilen Etiketler"
     like_stream:
       title: "İğnelenenler akışı"
+    liked:
+      title: "mesajlar gibi"
     mentioned_stream: "@Bahsedenler"
     mentions:
       title: "@Bahsedenler"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 2a4bb11e9..8c587d851 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -1118,8 +1118,6 @@ uk:
     total_users: "Всього користувачів"
     version: "Версія"
   status_messages:
-    create:
-      success: "Успішно згадано: %{names}"
     new:
       mentioning: "Згадати: %{person}"
     too_long: "{\"few\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"many\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"one\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"other\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\", \"zero\"=>\"скоротіть, будь ласка, ваше повідомлення до %{count} символів\"}"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 3d6c6e54f..1a8533ec9 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -472,8 +472,6 @@ vi:
       via: "thông qua %{link}"
       via_mobile: "qua di động"
   status_messages:
-    create:
-      success: "Đã nhắc đến: %{names}"
     new:
       mentioning: "Đang nhắc đến: %{person}"
     too_long: "{\"other\"=>\"trạng thái của bạn phải có ít hơn %{count} kí tự\", \"zero\"=>\"trạng thái của bạn phải có ít hơn %{count} kí tự\"}"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 803cc54b7..2e064b14f 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -449,8 +449,6 @@ zh-CN:
       via: "通过 %{link}"
       via_mobile: "通过移动设备"
   status_messages:
-    create:
-      success: "成功推荐了: %{names}"
     new:
       mentioning: "提及发布中: %{person}"
     too_long: "{\"other\"=>\"请确保您的状态信息不超过 %{count} 个字符\", \"zero\"=>\"请确保您的状态信息不超过 %{count} 个字符\"}"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 922484e3e..50e5abdc6 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -69,9 +69,9 @@ zh-TW:
       comments:
         other: "%{count}則留言"
         zero: "%{count}則留言"
-      current_segment: "目前時間區間在<b>%{post_day}</b>天中，平均每個使用者有<b>%{post_yest}</b>篇貼文"
+      current_segment: "根據%{post_day}天內的資料，目前時間間隔的使用者平均貼文數量是%{post_yest}篇"
       daily: "一天"
-      display_results: "顯示時間區間<b>%{segment}</b>內的結果"
+      display_results: "顯示以%{segment}為時間間隔的結果"
       go: "衝"
       month: "一個月"
       posts:
@@ -80,7 +80,7 @@ zh-TW:
       shares:
         other: "分享%{count}次"
         zero: "分享%{count}次"
-      tag_name: "標籤名：<b>%{name_tag}</b> 數目：<b>%{count_tag}</b>"
+      tag_name: "名稱：%{name_tag} 數量：%{count_tag}"
       usage_statistic: "使用狀況統計"
       users:
         other: "%{count}個使用者"
@@ -190,7 +190,7 @@ zh-TW:
       failure: "從社交面中移除聯絡人失敗"
       forbidden: "你不能這麼做。"
       invalid_statement: "不允許重複的項目。"
-      no_membership: "在那一面中找不到選擇的聯絡人。"
+      no_membership: "在那個社交面中找不到選擇的聯絡人。"
       success: "從社交面中移除聯絡人成功"
   aspects:
     add_to_aspect:
@@ -207,14 +207,15 @@ zh-TW:
       success: "成功刪除%{name}了。"
       success_auto_follow_back: "成功刪除%{name}了。但是因為你之前用這個社交面來自動反向追蹤，你應該要到使用者設定去指定新的社交面。"
     edit:
-      aspect_list_is_not_visible: "這一面中的連絡人無法互相看見。"
-      aspect_list_is_visible: "這一面中的連絡人可以互相看見。"
+      aspect_list_is_not_visible: "這個社交面中的連絡人無法互相看見。"
+      aspect_list_is_visible: "這個社交面中的連絡人可以互相看見。"
       confirm_remove_aspect: "確定要刪除這個社交面嗎？"
       rename: "改名"
       update: "更新"
       updating: "更新中"
     index:
       donate: "捐助"
+      donate_liberapay: "捐到 Liberapay 帳號"
       help:
         any_problem: "有問題嗎？"
         contact_podmin: "聯絡豆莢管理員！"
@@ -280,7 +281,7 @@ zh-TW:
       community_spotlight: "社群焦點"
       my_contacts: "我的聯絡人"
       no_contacts: "你好像應該要多加一些聯絡人！"
-      no_contacts_in_aspect: "你在這一面中還沒有任何聯絡人。下面是你可以加進這一面的聯絡人列表。"
+      no_contacts_in_aspect: "你在這個社交面中還沒有任何聯絡人。以下是你可以加進這一面的聯絡人清單。"
       no_contacts_message: "來看看 %{community_spotlight}"
       only_sharing_with_me: "跟我分享的人"
       start_a_conversation: "開始對話"
@@ -350,27 +351,27 @@ zh-TW:
       change_aspect_of_post_q: "我可以在貼文之後更改它發表的社交面嗎？"
       contacts_know_aspect_a: "不知道。無論如何他們都看不到社交面的名稱。"
       contacts_know_aspect_q: "我的聯絡人知道我把他們放到哪些社交面中嗎？"
-      contacts_visible_a: 如果你對某個面打開這個選項，那麼其中的所有聯絡人都可以從你個人檔案的"聯絡人"頁籤看到其他人。最好是在該社交面中的所有人都彼此認識的情況下，才開啟這個選項，比如說是專屬於某個社團或你所屬社群的社交面。不過聯絡人並不會知道你把這一面叫什麼名字。
+      contacts_visible_a: 如果你對某個社交面打開這個選項，那麼其中的所有聯絡人都可以從你個人檔案的"聯絡人"頁籤看到其他人。最好是在該社交面中的所有人都彼此認識的情況下，才開啟這個選項，比如說是專屬於某個社團或你所屬社群的社交面。不過聯絡人並不會知道你把這個社交面叫什麼名字。
       contacts_visible_q: "\"讓社交面中的聯絡人可以互相看見\"是什麼意思？"
-      delete_aspect_a: 請從流水帳畫面的側邊欄點一下"我的社交面"，然後點一下你想刪掉的那一面旁邊的鉛筆圖示。或是到你的聯絡人畫面，點選你想刪掉的那一面。接著點一下頁面右上方的垃圾桶圖示就可以了。
+      delete_aspect_a: 請從流水帳畫面的側邊欄點一下"我的社交面"，然後點一下你想刪掉的那個社交面旁邊的鉛筆圖示。或是到你的聯絡人畫面，點選你想刪掉的那一面。接著點一下頁面右上方的垃圾桶圖示就可以了。
       delete_aspect_q: "要怎樣刪掉社交面？"
-      person_multiple_aspects_a: 可以。在"聯絡人"頁面點一下"我的聯絡人"，可以看到聯絡人的列表。每個聯絡人的右邊有個社交面的選單，可以讓你把她/他加進社交面，無論幾個都可以，或是從某一面中移除掉。你也可以從聯絡人的個人檔案頁面，點社交面的選擇按鈕，來把他們加進某一面或從中移除。你還可以在流水帳中，把游標移到聯絡人的名字上面，目標卡片就會跳出來，讓你也可以設定他們所屬的社交面。
+      person_multiple_aspects_a: 可以。在"聯絡人"頁面點一下"我的聯絡人"，可以看到聯絡人的清單。每個聯絡人的右邊有個社交面的選單，可以讓你把她/他加進社交面，無論加進幾個都可以，也可以把她/他從某一面中移除掉。你也可以從聯絡人的個人檔案頁面，點社交面的選擇按鈕，來把他們加進某一面或從中移除。你還可以在流水帳中，把游標移到聯絡人的名字上面，目標卡片就會跳出來，讓你也可以設定他們所屬的社交面。
       person_multiple_aspects_q: "我可以把某人加到好幾個社交面中嗎？"
       post_multiple_aspects_a: 可以。當你在寫貼文時，可以用社交面選擇按鈕來指定或取消，預設是"所有社交面"。發表後所有你選擇的社交面都可以看到那篇貼文。你也可以從側邊欄選擇你要發表出去的社交面。當你發表新貼文時，在左側你所選擇的社交面會是預設要發表的對象。
       post_multiple_aspects_q: "我可以同時發表貼文到很多社交面去嗎？"
       remove_notification_a: "不會。如果你把他們加進更多其他的社交面，他們也不會收到通知，因為你們已經彼此分享了。"
-      remove_notification_q: "如果我把某人從某一面，或所有社交面中移除，他們會收到通知嗎？"
-      rename_aspect_a: 請從流水帳畫面的側邊欄點"我的社交面"，然後點你要改名的那一面旁邊的鉛筆圖示來。或是先到你的聯絡人頁面去，點選那一面。接著再到頁面頂端去點社交面名稱旁邊的編輯圖示，改完名字再點"更新"就可以了。
+      remove_notification_q: "如果我把某人從某個社交面，或所有社交面中移除，他們會收到通知嗎？"
+      rename_aspect_a: 請從流水帳畫面的側邊欄點"我的社交面"，然後點你要改名的那個社交面旁邊的鉛筆圖示來。或是先到你的聯絡人頁面去，點選那一面。接著再到頁面頂端去點社交面名稱旁邊的編輯圖示，改完名字再點"更新"就可以了。
       rename_aspect_q: "要怎樣改社交面的名字？"
-      restrict_posts_i_see_a: 可以。請點一下側邊欄的"我的社交面"，然後用點來選擇或是不選個別每一面。只有被選的社交面的貼文才會出現在流水帳裡。
+      restrict_posts_i_see_a: 可以。請點一下側邊欄的"我的社交面"，然後用點來選擇或是不選個別社交面。只有被選的社交面的貼文才會出現在流水帳裡。
       restrict_posts_i_see_q: "我可以過濾流水帳只看到來自特定社交面的貼文嗎？"
       title: "社交面"
-      what_is_an_aspect_a: "社交面是將你在 diaspora* 的聯絡人分群的方式。\"面\"是一種比喻，好像你展現給這個世界的其中一面。比如說你在職場的一面，你在家庭中的一面，或是你在某個團體中對裡面的朋友展現的一面。"
+      what_is_an_aspect_a: "社交面是將你在 diaspora* 的聯絡人分群的方式。「面」是一種比喻，好像你展現給這個世界的其中一張臉孔。比如說你在職場的一面，你在家庭中的一面，或是你在某個團體中對裡面的朋友展現的一面。"
       what_is_an_aspect_q: "什麼是社交面？"
       who_sees_post_a: "當你發表了一篇設限的貼文，就只有那個面(或是那些面，因為你也可以選擇好幾面)中的人才看得到。不在那個(或是那些面)中的聯絡人，就看不到那篇貼文，除非你把它公開。只有公開的貼文可以讓不在你任何社交面中的其它人看到。"
-      who_sees_post_q: "當我貼文到某一面時，誰看得到？"
+      who_sees_post_q: "當我貼文到某個社交面時，有誰會看見？"
     chat:
-      add_contact_roster_a: "首先，你要把聊天的權限給那個人所在的社交面。我們來開始：先到%{contacts_page}，選你要的那一面，然後點聊天的圖示就可以打開權限。%{toggle_privilege}如果你想的話，也可以先開一個社交面專門給你想跟他們即時聊天的人，比如說就叫做『聊天』，然後把那些人加進去。完成以後就可以到聊天的頁面，選你想即時聊天的人開始聊天。"
+      add_contact_roster_a: "首先，你要把聊天的權限給那個人所在的社交面。我們來開始：先到%{contacts_page}，選你要的那個社交面，然後點聊天的圖示就可以打開權限。%{toggle_privilege}如果你想的話，也可以先開一個社交面專門給你想跟他們即時聊天的人，比如說就叫做『聊天』，然後把那些人加進去。完成以後就可以到聊天的頁面，選你想即時聊天的人開始聊天。"
       add_contact_roster_q: "要怎樣在 diaspora* 跟某人即時聊天？"
       contacts_page: "聯絡人頁面"
       title: "即時聊天"
@@ -466,15 +467,15 @@ zh-TW:
       stream_full_of_posts_q: "為什麼我的流水帳裡面都是一些我不認識也沒跟他們分享的人的貼文？"
       title: "貼文和發表"
     private_posts:
-      can_comment_a: "只有在你發表該篇非公開貼文前，就已經在那一面中的使用者，才可以對貼文留言或按讚，而且必須要在登入 diaspora* 的狀態下。"
+      can_comment_a: "只有在你發表該篇非公開貼文前，就已經在那個社交面中的使用者，才可以對貼文留言或按讚，而且必須要在登入 diaspora* 的狀態下。"
       can_comment_q: "誰可以對我的非公開貼文留言或按讚？"
       can_reshare_a: "沒有人可以。非公開的貼文是不能轉貼的。不過，那些因為在你的社交面中，而可以在登入時看到貼文的人，也可能用複製、貼上的方式轉貼。要不要信任他們就留給你自己決定囉！"
       can_reshare_q: "誰可以轉貼我的非公開貼文？"
       see_comment_a: "只有該篇貼文的分享對象(也就是當初原作者所選擇社交面中的人)才可以看到貼文的留言和稱讚。"
       see_comment_q: "如果我對非公開貼文留言或按讚，誰可以看得到？"
       title: "非公開貼文"
-      who_sees_post_a: "只有在你發表該篇非公開貼文前，就已經在那一面中的使用者才可以看得到，並且必須要在登入 diaspora* 的狀態下。"
-      who_sees_post_q: "當我貼文到某一面時(也就是貼一篇非公開貼文)，有誰可以看得到？"
+      who_sees_post_a: "只有在你發表該篇非公開貼文前，就已經在那個社交面中的使用者才可以看得到，並且必須要在登入 diaspora* 的狀態下。"
+      who_sees_post_q: "當我貼文到某個社交面時(也就是貼一篇非公開貼文)，有誰可以看得到？"
     private_profiles:
       title: "私人檔案"
       whats_in_profile_a: "私人檔案裡面可以有自傳、所在地、性別、還有生日。你可以選擇要提供哪些給人看，沒有一項是必需要填的。只有那些你把他們加到社交面中的人，在登入的狀態下可以看到你的私人檔案。當他們看你的個人檔案時，除了你的公開貼文之外，還可以看到他們所屬社交面的非公開貼文。"
@@ -512,8 +513,8 @@ zh-TW:
       reshare_public_post_aspects_q: "我可以轉貼一篇公開貼文到特定的社交面嗎？"
       title: "轉貼貼文"
     sharing:
-      add_to_aspect_a1: "假設春嬌把志明加進某一面，但是志明還沒有把春嬌加進任何社交面："
-      add_to_aspect_a2: "這就叫做不對稱的分享。如果志明也把春嬌加進某一面的話，那就會變成互相分享了。他們的公開貼文，和對應到互相指定社交面的非公開貼文，就會開始出現在彼此的流水帳中。而且春嬌也可以看志明的私人檔案了。之後他們還可以送私人訊息給對方。"
+      add_to_aspect_a1: "假設春嬌把志明加進某個社交面，但是志明還沒有把春嬌加進任何一面："
+      add_to_aspect_a2: "這就叫做不對稱的分享。如果志明也把春嬌加進某個社交面的話，那就會變成互相分享了。他們的公開貼文，和對應到互相指定社交面的非公開貼文，就會開始出現在彼此的流水帳中。而且春嬌也可以看志明的私人檔案了。之後他們還可以送私人訊息給對方。"
       add_to_aspect_li1: 志明會收到一個通知說春嬌已經"開始跟他分享"了。
       add_to_aspect_li2: "春嬌會開始在她的流水帳看到志明的公開貼文。"
       add_to_aspect_li3: "春嬌不會看到志明的任何一篇非公開貼文。"
@@ -522,13 +523,13 @@ zh-TW:
       add_to_aspect_li6: "志明也可以看春嬌的私人檔案(包含自傳、所在地、性別、以及生日)。"
       add_to_aspect_li7: 春嬌會出現在志明聯絡人頁面中的"跟我分享的人"裡面。
       add_to_aspect_li8: "春嬌也開始可以在貼文裡 @指指點點 志明。"
-      add_to_aspect_q: "當我把某人加進某一面，或是當某人把我加進她/他的某一面時，會發生什麼事？"
+      add_to_aspect_q: "當我把某人加進某個社交面，或是當某人把我加進她/他的某一面時，會發生什麼事？"
       list_not_sharing_a: "沒有，但是你可以看某人的個人檔案來檢查她/他是否有跟你分享。如果有的話，社交面的按鈕會顯示你所加她/他的那個或那些面；如果沒有的話，按鈕會是灰色的。"
-      list_not_sharing_q: "有那個聯絡人列表是我把他們加進某一面裡面，但是他們卻沒有加我的嗎？"
-      only_sharing_a: 這些人已經把你加進他們的社交面了，但是你的社交面中還沒有他們。也就是說他們有跟你分享，但是你卻(還)沒有跟他們分享，就好像是他們在追蹤你。如果你把他們加進任何一面，他們就會出現在那一面的列表中，而不會在"跟我分享的人"裡面了。請看上面的說明。
+      list_not_sharing_q: "是否有我把他們加進某一個社交面，但是他們卻沒有加我的聯絡人清單呢？"
+      only_sharing_a: 這些人已經把你加進他們的社交面了，但是你的社交面中還沒有他們。也就是說他們有跟你分享，但是你卻(還)沒有跟他們分享，就好像是他們在追蹤你。如果你把他們加進任何社交面，他們就會出現在那一面的清單中，而不會在"跟我分享的人"裡面了。請看上面的說明。
       only_sharing_q: 聯絡人頁面中有"跟我分享的人"，出現在裡面的人是誰？
-      see_old_posts_a: "不行，他們只能看到你對那一面的新貼文。並且就跟其他人一樣，他們也可以從你的個人檔案頁面，看到你過去的公開貼文，說不定他們也可以在自己的流水帳看到。"
-      see_old_posts_q: "如果我把某人加進某一面，她/他可以看到我對那個社交面過去的貼文嗎？"
+      see_old_posts_a: "不行，他們只能看到你對那個社交面的新貼文。並且就跟其他人一樣，他們也可以從你的個人檔案頁面，看到你過去的公開貼文，說不定他們也可以在自己的流水帳看到。"
+      see_old_posts_q: "如果我把某人加進某個社交面，她/他可以看到我對那一面過去的貼文嗎？"
       sharing_notification_a: "當每次有人開始跟你分享時，你應該都會收到一則消息。"
       sharing_notification_q: "怎麼知道某人已經開始跟我分享了？"
       title: "分享"
@@ -926,7 +927,7 @@ zh-TW:
     comment_label: "<b>留言</b>: %{data}"
     confirm_deletion: "確定要刪除這一項嗎？"
     delete_link: "刪除項目"
-    not_found: "<u>目標貼文或留言找不到了。可能已經被主人給刪掉了！</u>"
+    not_found: "目標貼文或留言已經找不到了。可能已經被作者給刪掉了！"
     post_label: "<b>貼文</b>: %{content}"
     reason_label: "理由:"
     reported_label: "<b>回報人<b> %{person}"
@@ -1039,8 +1040,6 @@ zh-TW:
     total_users: "使用者總數"
     version: "版本"
   status_messages:
-    create:
-      success: "指指點點成功：%{names}"
     new:
       mentioning: "指指點點中：%{person}"
     too_long: "狀態訊息請在 %{count} 字內。目前字數是 %{current_length}"
@@ -1056,6 +1055,8 @@ zh-TW:
     aspects_stream: "社交面"
     comment_stream:
       title: "有人留言的貼文"
+    commented:
+      title: "留言過的貼文"
     community_spotlight_stream: "社群焦點"
     followed_tag:
       add_a_tag: "新增標籤"
@@ -1065,6 +1066,8 @@ zh-TW:
     followed_tags_stream: "#追蹤中的標籤"
     like_stream:
       title: "稱讚的流水帳"
+    liked:
+      title: "稱讚過的貼文"
     mentioned_stream: "@指指點點"
     mentions:
       title: "@指指點點"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 4380f2bbf..f7e40e37e 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -226,6 +226,7 @@ da:
           quote: "Indsæt citat"
           write: "Rediger besked"
         write: "Skriv"
+      mention_success: "<%= names %> blev omtalt."
       near_from: "Sendt fra: <%= location %>"
       option: "Svar"
       public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner"
diff --git a/config/locales/javascript/javascript.de-CH.yml b/config/locales/javascript/javascript.de-CH.yml
index 962c6deca..bd62fdfa0 100644
--- a/config/locales/javascript/javascript.de-CH.yml
+++ b/config/locales/javascript/javascript.de-CH.yml
@@ -6,6 +6,49 @@
 
 de-CH:
   javascripts:
+    confirm_dialog: "Bisch sicher?"
+    delete: "Lösche"
+    header:
+      contacts: "Kontäkt"
+      conversations: "Nochrichte"
+      help: "Hilf"
+      log_out: "Abmelde"
+      notifications: "Benochtichtigunge"
+      profile: "Profil"
+      search: "Sueche"
+      settings: "Iistellige"
+      view_all: "Alli aazeige"
+    ignore: "Ignoriere"
+    my_activity: "Mini Aktivitätä"
+    photo_uploader:
+      looking_good: "OMG, du gsesch super us!"
+    poll:
+      vote: "Abstimme"
+    profile:
+      bio: "Beschriibig"
+      born: "Geburi"
+      contacts: "Kontäkt"
+      gender: "Gschlächt"
+      location: "Ort"
+      photos: "Fotis"
+      posts: "Biiträg"
+    show_more: "Meh aazeige"
+    stream:
+      comment: "Kommentiere"
+      follow: "Folge"
+      hide: "Verstecke"
+      like: "Gfallt mer"
+      likes:
+        one: "Öpperem gfällt da"
+        other: "<%= count %> Lüüt gfällt da"
+        zero: "Niemertem gfällt da"
+      limited: "Begrenzt"
+      public: "Öffentlich"
+      reshare: "Wiitersägä"
+      show_nsfw_post: "Biitrag aazeige"
+      show_nsfw_posts: "Alli aazeige"
+      unfollow: "Nüm folge"
+      unlike: "Gfallt mer nüme"
     timeago:
       day: "eim Tag"
       days:
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index f41bb35e2..85c5a0edb 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -227,6 +227,7 @@ de:
           quote: "Zitat einfügen"
           write: "Nachricht bearbeiten"
         write: "Verfassen"
+      mention_success: "Erfolgreich erwähnt: <%= names %>"
       near_from: "Gesendet aus <%= location %>"
       option: "Antwort"
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
@@ -244,7 +245,7 @@ de:
       successful: "Der Beitrag wurde erfolgreich weitergesagt!"
     show_more: "Mehr zeigen"
     stream:
-      comment: "Kommentar"
+      comment: "Kommentieren"
       comments:
         one: "<%= count %> Kommentar"
         other: "<%= count %> Kommentare"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 072b83442..1f033956c 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -226,6 +226,7 @@ de_formal:
           quote: "Zitat einfügen"
           write: "Nachricht bearbeiten"
         write: "Verfassen"
+      mention_success: "Erfolgreich erwähnt: <%= names %>"
       near_from: "In der Nähe von <%= location %>"
       option: "Antwort"
       public: "Öffentlich: Ihr Beitrag wird von allen gesehen und von Suchmaschinen gefunden werden können"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 8a78f24b9..26b70cf34 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -227,6 +227,7 @@ es-AR:
           quote: "Insertar cita"
           write: "Editar post"
         write: "Escribir"
+      mention_success: "Mencionados exitosamente: <%= names %>"
       near_from: "Cerca de: <%= location %>"
       option: "Respuesta"
       public: "Publica: tu publicación será visible para cualquiera en Internet y los buscadores podrán encontrarla"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 43e3d8662..790b80cbe 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -218,6 +218,7 @@ es:
           quote: "Insertar comillas"
           write: "Editar mensaje"
         write: "Escribir"
+      mention_success: "Mencionaste correctamente <%= names %>"
       near_from: "Cerca de: <%= location %>"
       option: "Respuesta"
       public: "Público - tu publicación es visible para todos, incluyendo buscadores"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 00f47d0ca..381f67b42 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -228,6 +228,7 @@ fr:
           quote: "Insérer une citation"
           write: "Modifier le message"
         write: "Écrire"
+      mention_success: "Mentions réussies : <%= names %>"
       near_from: "Posté à : <%= location %>"
       option: "Choix"
       public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index b998dd286..fada15de8 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -141,6 +141,7 @@ hu:
     show_more: "tovább"
     stream:
       comment: "Hozzászólás"
+      disable_post_notifications: "A bejegyzésről szóló értesítések kikapcsolása"
       follow: "Követem"
       followed_tag:
         add_a_tag: "Címke hozzáadása"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 87f4d3a46..e3af03d8f 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -218,6 +218,7 @@ ja:
           quote: "引用の挿入"
           write: "メッセージを編集"
         write: "書く"
+      mention_success: "メンションしました: <%= names %>"
       near_from: "<%= location %>からの投稿"
       option: "回答"
       public: "公開 - 投稿は全ての人から見ることができ、検索エンジンで見つかるようになります"
diff --git a/config/locales/javascript/javascript.oc.yml b/config/locales/javascript/javascript.oc.yml
index 73bf4f8d9..f3196561e 100644
--- a/config/locales/javascript/javascript.oc.yml
+++ b/config/locales/javascript/javascript.oc.yml
@@ -229,6 +229,7 @@ oc:
           quote: "Inserir una citacion"
           write: "Modificar lo messatge"
         write: "Escriure"
+      mention_success: "Es ben estat mencionat : <%= names %>"
       near_from: "Postat a : <%= location %>"
       option: "Responsa"
       public: "Public - vòstre messatge serà visible de totes e trobat pels motors de recèrca"
@@ -316,7 +317,7 @@ oc:
       seconds: "mens d'una minuta"
       suffixAgo: ""
       suffixFromNow: "ara"
-      wordSeparator: ""
+      wordSeparator: " "
       year: "environ un an"
       years:
         one: "un an"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 1821272d1..ee09e8a34 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -228,6 +228,7 @@ pt-BR:
           quote: "Inserir citação"
           write: "Editar mensagem"
         write: "Escrever"
+      mention_success: "Mencionados com sucesso: <%= names %>"
       near_from: "Publicado de: <%= location %>"
       option: "Resposta"
       public: "Pública: a sua publicação será totalmente visível na Web e poderá ser encontrada por meio de mecanismos de buscas"
diff --git a/config/locales/javascript/javascript.sc.yml b/config/locales/javascript/javascript.sc.yml
index 72c004e46..72af9ea88 100644
--- a/config/locales/javascript/javascript.sc.yml
+++ b/config/locales/javascript/javascript.sc.yml
@@ -8,6 +8,8 @@ sc:
   javascripts:
     header:
       moderator: "Moderatore"
+    publisher:
+      mention_success: "Etichetados curretamente: <%= names %>"
     timeago:
       prefixAgo: ""
       prefixFromNow: ""
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 98582e7a1..58f151a3d 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -318,14 +318,18 @@ uk:
       wasnt_that_interesting: "Гаразд, мабуть, стежити за міткою #<%= tagName %> було не так вже цікаво..."
     timeago:
       day: "день"
-      days: "%d днів[-i]"
+      days:
+        other: "%d днів[-i]"
       hour: "близько години"
-      hours: "близько %d годин"
+      hours:
+        other: "близько %d годин"
       inPast: "в будь-який момент"
       minute: "близько хвилини"
-      minutes: "%d хвилин[-и]"
+      minutes:
+        other: "%d хвилин[-и]"
       month: "близько місяця"
-      months: "%d місяця[-ів]"
+      months:
+        other: "%d місяця[-ів]"
       prefixAgo: ""
       prefixFromNow: "через"
       seconds: "декілька секунд"
@@ -333,7 +337,8 @@ uk:
       suffixFromNow: "з цієї миті"
       wordSeparator: " "
       year: "близько року"
-      years: "%d років"
+      years:
+        other: "%d років"
     unblock_failed: "Не вдалось розблокувати цього користувача"
     viewer:
       reshared: "Поділилися"
\ No newline at end of file
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index e424f7cc1..f7ce5f578 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -69,14 +69,14 @@ zh-TW:
     aspect_navigation:
       add_an_aspect: "+ 新增社交面"
       deselect_all: "全不選"
-      no_aspects: "沒選任何一面"
+      no_aspects: "沒選任何社交面"
       select_all: "全選"
     aspects:
       create:
         add_a_new_aspect: "新增社交面"
         failure: "造社交面失敗。"
         success: "新社交面<%= name %>已經造出來了"
-      make_aspect_list_visible: "要讓這一面中的聯絡人可以看得到彼此嗎？"
+      make_aspect_list_visible: "要讓這個社交面中的聯絡人可以看得到彼此嗎？"
       name: "名稱"
     bookmarklet:
       post_something: "貼到 diaspora*"
@@ -92,12 +92,12 @@ zh-TW:
     confirm_unload: "請確認要離開這個頁面。你目前輸入的資料將不會保留。"
     contacts:
       add_contact: "加聯絡人"
-      aspect_chat_is_enabled: "這一面的聯絡人可以跟你聊天。"
-      aspect_chat_is_not_enabled: "這一面的聯絡人不能跟你聊天。"
-      aspect_list_is_not_visible: "這一面中的連絡人無法互相看見。"
-      aspect_list_is_visible: "這一面中的連絡人可以互相看見。"
-      error_add: "沒辦法把 <%= name %> 加進這一面 :("
-      error_remove: "沒辦法把 <%= name %> 從這一面中移除 :("
+      aspect_chat_is_enabled: "這個社交面中的聯絡人可以跟你聊天。"
+      aspect_chat_is_not_enabled: "這個社交面中的聯絡人不能跟你聊天。"
+      aspect_list_is_not_visible: "這個社交面中的連絡人無法互相看見。"
+      aspect_list_is_visible: "這個社交面中的連絡人可以互相看見。"
+      error_add: "沒辦法把 <%= name %> 加進這個社交面 :("
+      error_remove: "沒辦法把 <%= name %> 從這個社交面中移除 :("
       remove_contact: "刪聯絡人"
       search_no_results: "沒找到聯絡人"
     conversation:
@@ -219,6 +219,7 @@ zh-TW:
           quote: "加入引用文字"
           write: "編輯訊息"
         write: "編寫"
+      mention_success: "指指點點成功: <%= names %>"
       near_from: "貼文地點：<%= location %>"
       option: "答案"
       public: "公開：所有人都能看到你的貼文，包括搜尋引擎"