Merge branch 'release/0.7.9.0'v0.7.9.0

111 files changed, 228 insertions, 149 deletions

diff --git a/Changelog.md b/Changelog.md
index 20845b1d6..3d6a74023 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,17 @@
+# 0.7.9.0
+
+## Refactor
+* Improve public stream performance and cleanup unused indexes [#7944](https://github.com/diaspora/diaspora/pull/7944)
+* Improve wording of "Toggle mobile" [#7926](https://github.com/diaspora/diaspora/pull/7926)
+
+## Bug fixes
+* Do not autofollow back a user you are ignoring [#7913](https://github.com/diaspora/diaspora/pull/7913)
+* Fix photos gallery when too many thumbnails are shown [#7943](https://github.com/diaspora/diaspora/pull/7943)
+* Fix extended profile visibility switch showing the wrong state [#7955](https://github.com/diaspora/diaspora/pull/7955)
+
+## Features
+* Support ignore users on mobile [#7884](https://github.com/diaspora/diaspora/pull/7884)
+
 # 0.7.8.0
 
 ## Refactor
diff --git a/Gemfile b/Gemfile
index 20cddde2a..b7ae543c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,7 +58,7 @@ gem "rack-cors", "1.0.2", require: "rack/cors"
 
 gem "autoprefixer-rails",     "8.6.5"
 gem "bootstrap-sass",         "3.3.7"
-gem "bootstrap-switch-rails", "3.3.4"
+gem "bootstrap-switch-rails", "3.3.3" # 3.3.4 is broken, see https://github.com/Bttstrp/bootstrap-switch/issues/691
 gem "compass-rails",          "3.1.0"
 gem "sass-rails",             "5.0.7"
 gem "sprockets-rails",        "3.2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 40e517274..e2f46878b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,7 +69,7 @@ GEM
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    bootstrap-switch-rails (3.3.4)
+    bootstrap-switch-rails (3.3.3)
     buftok (0.2.0)
     builder (3.2.3)
     byebug (10.0.2)
@@ -771,7 +771,7 @@ DEPENDENCIES
   asset_sync (= 2.5.0)
   autoprefixer-rails (= 8.6.5)
   bootstrap-sass (= 3.3.7)
-  bootstrap-switch-rails (= 3.3.4)
+  bootstrap-switch-rails (= 3.3.3)
   capybara (= 3.11.1)
   carrierwave (= 1.2.3)
   compass-rails (= 3.1.0)
diff --git a/app/assets/javascripts/app/views/gallery_view.js b/app/assets/javascripts/app/views/gallery_view.js
index 73a8a70c1..badf0c02d 100644
--- a/app/assets/javascripts/app/views/gallery_view.js
+++ b/app/assets/javascripts/app/views/gallery_view.js
@@ -41,7 +41,7 @@ app.views.Gallery = app.views.Base.extend({
         if (image.naturalHeight > window.innerHeight && image.naturalHeight > image.naturalWidth * 2) {
           image.classList.add("too-tall");
         } else {
-          var margins = 95; // Margins are 80px for thumbnails height and 15px for top image margin
+          var margins = 110; // Margins are 80px for thumbnails height and 15px for top image margin + scroll-x height
           image.style = "max-height: " + (window.innerHeight - margins) + "px";
         }
       }
diff --git a/app/assets/stylesheets/gallery.scss b/app/assets/stylesheets/gallery.scss
index 3966bea20..67a1a467c 100644
--- a/app/assets/stylesheets/gallery.scss
+++ b/app/assets/stylesheets/gallery.scss
@@ -50,15 +50,17 @@ $margin: 15px;
 
   .indicator {
     bottom: 0;
+    overflow-x: auto;
+    white-space: nowrap;
 
     li {
       border: 0;
       border-radius: $thumbnail-size / 2;
       height: $thumbnail-size;
-      margin: 6px;
-      margin-bottom: $margin;
+      margin: $margin 6px;
       vertical-align: middle;
       width: $thumbnail-size;
+      background-size: cover;
 
       &.active,
       &:hover {
diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss
index 6447df013..f8b22d5f7 100644
--- a/app/assets/stylesheets/mobile/mobile.scss
+++ b/app/assets/stylesheets/mobile/mobile.scss
@@ -350,6 +350,7 @@ footer {
   }
 
   .bottom-bar {
+    margin: 0;
     position: static;
   }
 }
@@ -694,6 +695,21 @@ select#aspect_ids_ {
   .entypo-camera { margin-right: 0; }
 }
 
+.mobile-icon-bar {
+  background: $framed-background;
+  border-top: 1px solid $border-grey;
+  display: block;
+  padding: 1px 6px;
+  position: relative;
+}
+
+.mobile-icon-bar-button {
+  color: $text-grey;
+  float: right;
+  font-size: large;
+  padding: 0;
+}
+
 #publisher-textarea-wrapper {
   border-radius: 2px;
   margin: 12px 0px;
diff --git a/app/assets/templates/header_tpl.jst.hbs b/app/assets/templates/header_tpl.jst.hbs
index 9c3270e5b..d730a8bd5 100644
--- a/app/assets/templates/header_tpl.jst.hbs
+++ b/app/assets/templates/header_tpl.jst.hbs
@@ -64,7 +64,6 @@
           <ul class="nav navbar-nav navbar-left visible-sm-block visible-xs-block">
             <li class="visible-xs-block"><a href="/stream">{{t "my_stream"}}</a></li>
             <li class="visible-xs-block"><a href="/activity">{{t "my_activity"}}</a></li>
-            <li><a href="/mobile/toggle">{{t "header.toggle_mobile"}}</a></li>
           </ul>
 
           <ul class="nav navbar-nav navbar-right">
@@ -87,6 +86,7 @@
                 {{else if current_user.moderator}}
                    <li><a href="/report">{{t "header.moderator"}}</a></li>
                 {{/if}}
+                <li><a class="visible-xs-block" href="/mobile/toggle">{{t "header.switch_to_touch_optimized_mode"}}</a></li>
                 <li><a href="/users/sign_out" data-method="delete">{{t "header.log_out"}}</a></li>
               </ul>
             </li>
diff --git a/app/controllers/blocks_controller.rb b/app/controllers/blocks_controller.rb
index 7256a38c8..39d8cb91c 100644
--- a/app/controllers/blocks_controller.rb
+++ b/app/controllers/blocks_controller.rb
@@ -10,6 +10,7 @@ class BlocksController < ApplicationController
 
     respond_to do |format|
       format.json { head :no_content }
+      format.any { redirect_back fallback_location: root_path }
     end
   end
 
diff --git a/app/models/user/connecting.rb b/app/models/user/connecting.rb
index 4ddd46e3e..232dba405 100644
--- a/app/models/user/connecting.rb
+++ b/app/models/user/connecting.rb
@@ -11,6 +11,8 @@ class User
     # @param [Aspect] aspect The aspect to add them to.
     # @return [Contact] The newly made contact for the passed in person.
     def share_with(person, aspect)
+      return if blocks.where(person_id: person.id).exists?
+
       contact = contacts.find_or_initialize_by(person_id: person.id)
       return false unless contact.valid?
 
diff --git a/app/views/api/openid_connect/error/error.mobile.haml b/app/views/api/openid_connect/error/error.mobile.haml
index dcfd1f5f8..75512477f 100644
--- a/app/views/api/openid_connect/error/error.mobile.haml
+++ b/app/views/api/openid_connect/error/error.mobile.haml
@@ -5,4 +5,4 @@
 = render partial: "api/openid_connect/error/error"
 
 %footer
-  = link_to t("layouts.application.toggle"), toggle_mobile_path
+  = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml
index 57f168682..a9d7df344 100644
--- a/app/views/devise/passwords/edit.mobile.haml
+++ b/app/views/devise/passwords/edit.mobile.haml
@@ -26,4 +26,4 @@
             = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary"
 
 %footer
-  = link_to t("layouts.application.toggle"), toggle_mobile_path
+  = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml
index e588d71d0..af496b0bf 100644
--- a/app/views/devise/passwords/new.mobile.haml
+++ b/app/views/devise/passwords/new.mobile.haml
@@ -26,4 +26,4 @@
 
   = link_to t('devise.sessions.new.sign_in'), new_user_session_path()
 
-  = link_to t('layouts.application.toggle'), toggle_mobile_path
+  = link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
diff --git a/app/views/layouts/_drawer.mobile.haml b/app/views/layouts/_drawer.mobile.haml
index 1f248a976..61b6045dc 100644
--- a/app/views/layouts/_drawer.mobile.haml
+++ b/app/views/layouts/_drawer.mobile.haml
@@ -59,5 +59,5 @@
               .pull-right.badge
                 = unreviewed_reports_count
             = t("admins.admin_bar.report")
-      %li= link_to t("layouts.application.toggle"), toggle_mobile_path
+      %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
       %li= link_to t("layouts.header.logout"), destroy_user_session_path, method: :delete
diff --git a/app/views/people/show.mobile.haml b/app/views/people/show.mobile.haml
index f35f81cfc..4d8f1deae 100644
--- a/app/views/people/show.mobile.haml
+++ b/app/views/people/show.mobile.haml
@@ -10,7 +10,23 @@
     %span.description
       = @person.diaspora_handle
     - if user_signed_in? && @person != current_user.person
-      = render 'aspect_memberships/aspect_membership_dropdown'
+      - if @presenter.full_hash[:block]
+        .pull-right
+          = link_to t("users.privacy_settings.stop_ignoring"),
+            block_path(@presenter.full_hash[:block][:id]),
+            class: "btn btn-danger",
+            method: :delete
+      - else
+        = render "aspect_memberships/aspect_membership_dropdown"
+    .clear
+  - if user_signed_in? && @person != current_user.person && !@presenter.full_hash[:block]
+    .mobile-icon-bar
+      = link_to "",
+        blocks_path(block: {person_id: @person.id}),
+        data: {confirm: t("are_you_sure_ignore_user")},
+        method: :post,
+        confirm: true,
+        class: "btn entypo-block shield mobile-icon-bar-button"
     .clear
   .bottom-bar
     - if !@person.tag_string.blank? && user_signed_in?
diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
index 99c858cd2..7837a875d 100644
--- a/app/views/registrations/new.mobile.haml
+++ b/app/views/registrations/new.mobile.haml
@@ -15,4 +15,4 @@
 %footer.footer
   %ul
     %li= link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
-    %li= link_to t("layouts.application.toggle"), toggle_mobile_path
+    %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index e15f7af03..a7d7a64aa 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -21,4 +21,4 @@
           id: "forgot_password_link"
     - if display_registration_link?
       %li= link_to t("devise.shared.links.sign_up"), new_registration_path(resource_name)
-    %li= link_to t("layouts.application.toggle"), toggle_mobile_path
+    %li= link_to t("layouts.application.switch_to_standard_mode"), toggle_mobile_path
diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml
index 2032d6197..59725ac51 100644
--- a/app/views/shared/_links.haml
+++ b/app/views/shared/_links.haml
@@ -4,6 +4,6 @@
   source_url.to_s,
   title: t("layouts.application.source_package")
 %li= link_to t("layouts.application.statistics_link"), statistics_path
-%li= link_to t("layouts.application.toggle"), toggle_mobile_path
+%li= link_to t("layouts.application.switch_to_touch_optimized_mode"), toggle_mobile_path
 - if AppConfig.settings.terms.enable?
   %li= link_to t("_terms"), terms_path
diff --git a/config/defaults.yml b/config/defaults.yml
index 03335b87e..8bef03ea4 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.7.8.0" # Do not touch unless doing a release, do not backport the version number that's in master
+    number: "0.7.9.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index ea806289c..3040692d0 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -217,7 +217,6 @@ ar:
       powered_by: "بدعم DIASPORA*"
       public_feed: "ملقم دياسبرا العام لـ %{name}"
       source_package: "نزّل حزمة الشِّفرة المصدريّة"
-      toggle: "حَوِّل لموقع الهواتف المحمولة"
       whats_new: "ما الجديد؟"
     header:
       code: "شيفرة"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index bb2a56aef..ea39a0833 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -217,7 +217,6 @@ bg:
       back_to_top: "Нагоре"
       powered_by: "Благодарение на DIASPORA*"
       public_feed: "Публична емисия от Diaspora за %{name}"
-      toggle: "вкл./изкл. на мобилния изглед"
       whats_new: "какво ново?"
     header:
       code: "код"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 1432809a5..10d0ccdf5 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -321,7 +321,6 @@ br:
       powered_by: "KASET EN-DRO GANT DIASPORA*"
       public_feed: "Gwazh diaspora* foran evit %{name}"
       source_package: "Pellgargañ pakad ar boneg tarzh"
-      toggle: "gweredekaat/diweredekaat ar stumm evit an hezougoù"
       whats_new: "petra nevez ?"
     header:
       code: "kod"
diff --git a/config/locales/diaspora/bs.yml b/config/locales/diaspora/bs.yml
index 52f901ab3..ecca3b459 100644
--- a/config/locales/diaspora/bs.yml
+++ b/config/locales/diaspora/bs.yml
@@ -299,7 +299,6 @@ bs:
       powered_by: "POKREĆE DIASPORA*"
       public_feed: "Javna Diaspora Veza za %{name}"
       source_package: "preuzmi paket izvornog koda"
-      toggle: "štimanje mobilno"
       whats_new: "šta je novo?"
     header:
       code: "kod"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 5ecb263bd..9d2946e5e 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -215,6 +215,7 @@ cs:
         tos: "Viz podmínky služby této aplikace"
   are_you_sure: "Jste si jisti?"
   are_you_sure_delete_account: "Opravdu chcete uzavřít svůj účet? Tuto operaci nelze vrátit!"
+  are_you_sure_ignore_user: "Tohoto uživatele budete ignorovat. Opravdu to chcete?"
   aspect_memberships:
     destroy:
       failure: "Nepodařilo se odstranit osobu z aspektu"
@@ -653,7 +654,8 @@ cs:
       public_feed: "Veřejný proud diaspory* pro %{name}"
       source_package: "Stáhnout balík se zdrojovým kódem"
       statistics_link: "Statistiky podu"
-      toggle: "Přepnout mobilní / plnou verzi"
+      switch_to_standard_mode: "Přepnutí do standardního režimu"
+      switch_to_touch_optimized_mode: "Přepnutí do režimu dotykového displeje"
       whats_new: "Co je nového?"
     header:
       code: "Kód"
@@ -1253,8 +1255,9 @@ cs:
       new_password: "Nové heslo"
       private_message: "obdržíte soukromou zprávu"
       protocol_handler:
-        description: "Kliknutím na toto tlačítko bude do Vašeho prohlížeče nainstalován handler, který nám dovolí otevírat adresy URL typu web+diaspora:// na Vašem domácím podu. Tohle je aktuálně experimentální a interakce budou záležet na Vašem prohlížeči."
-        register: "Registrovat"
+        browser: "Tento protokol je aktuálně v experimentálním stádiu a úspěšnost interakcí pomocí něj bude záležet na Vašem prohlížeči. Pokud chcete spravovat nebo odstranit tento handler, musíte to udělat v nastaveních Vašeho prohlížeče. Tlačítko níže bude vždy povolené a budete muset nastavit handler zvlášť na každém prohlížeči, který používáte."
+        description: "web+diaspora:// je nový webový protokol, který jsme představili. Jakýkoliv odkaz na stránku diaspora* na externí stránce, který tento protokol používá, může být otevřen v podu, na kterém je registrován Váš účet diaspora*. Kliknutím na tlačítko níže nastavíte Váš prohlížeč, aby pro rozpoznávání externích odkazů web+diaspora:// používal adresu %{pod_url}."
+        register: "Registrovat handler web+diaspora:// na tomto prohlížečí"
         title: "Handler pro protokol web+diaspora://"
       receive_email_notifications: "Přijímat oznámení e-mailem, když:"
       request_export: "Vyžádat si má profilová data"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 4d1de038b..2e9d6f092 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -68,8 +68,6 @@ cy:
     create:
       sent: "Your invitation has been sent."
   layouts:
-    application:
-      toggle: "toggle mobile site"
     header:
       logout: "Allgofnodi"
       profile: "profile"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 2b276a376..1ba72e8bc 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -205,6 +205,7 @@ da:
         tos: "Se applikationens servicevilkår"
   are_you_sure: "Er du sikker?"
   are_you_sure_delete_account: "Er du helt sikker på at du ønsker at lukke din konto? Det kan ikke fortrydes!"
+  are_you_sure_ignore_user: "Vil du ignorere denne bruger. Er du sikker?"
   aspect_memberships:
     destroy:
       failure: "Kunne ikke fjerne person fra aspekt."
@@ -642,7 +643,6 @@ da:
       public_feed: "Offentligt Diaspora-nyhedsfeed for %{name}"
       source_package: "Download kildekoden"
       statistics_link: "Pod statistik"
-      toggle: "Slå mobil side til/fra"
       whats_new: "Hvad er nyt?"
     header:
       code: "Kode"
diff --git a/config/locales/diaspora/de-CH.yml b/config/locales/diaspora/de-CH.yml
index 3004595e9..82cac40d6 100644
--- a/config/locales/diaspora/de-CH.yml
+++ b/config/locales/diaspora/de-CH.yml
@@ -346,7 +346,6 @@ de-CH:
       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:
       code: "Code"
diff --git a/config/locales/diaspora/de-moo.yml b/config/locales/diaspora/de-moo.yml
index 329f3bc4d..5ce0be51a 100644
--- a/config/locales/diaspora/de-moo.yml
+++ b/config/locales/diaspora/de-moo.yml
@@ -627,7 +627,6 @@ de-moo:
       public_feed: "Öffentlicher diaspora* Feed von %{name}"
       source_package: "Quellcodepaket herunterladen"
       statistics_link: "Bauernhof-Statistiken"
-      toggle: "Mobile Ansicht umschalten"
       whats_new: "Was gibt's Neues?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index a17c0b003..d6d51ab1b 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -101,7 +101,7 @@ de:
       ? "no"
       : Nein
       nsfw: "NSFW (unpassend für den Arbeitsplatz)"
-      spotlight: "Interessante Leute"
+      spotlight: "Schaukasten"
       unknown: "Unbekannt"
       ? "yes"
       : Ja
@@ -112,24 +112,24 @@ de:
       add_admin: "%{name} wurde zum Administrator ernannt."
       add_invites: "Einladungen hinzufügen"
       add_moderator: "%{name} wurde zum Moderator ernannt."
-      add_spotlight: "%{name} wurde zu Interessante Leute hinzugefügt."
+      add_spotlight: "%{name} wurde in den Gemeinschafts-Schaukasten gestellt"
       are_you_sure: "Möchtest du dein Konto wirklich schließen?"
       are_you_sure_lock_account: "Bist du dir sicher, dass du dieses Konto sperren möchtest?"
       are_you_sure_unlock_account: "Bist du dir sicher, dass du dieses Konto entsperren möchtest?"
       close_account: "Konto schließen"
       delete_admin: "%{name} wurde von der Liste der Administratoren entfernt."
       delete_moderator: "%{name}  wurde von der Liste der Moderatoren entfernt."
-      delete_spotlight: "%{name} wurde aus Interessante Leute entfernt."
+      delete_spotlight: "%{name} wurde vom Gemeinschafts-Schaukasten entfernt."
       does_not_exist: "Benutzer existiert nicht!"
       email_to: "per E-Mail einladen"
       invite: "einladen"
       lock_account: "Konto sperren"
       make_admin: "Zum Administrator ernennen"
       make_moderator: "Zum Moderator ernennen"
-      make_spotlight: "Zu Interessante Leute hinzufügen"
+      make_spotlight: "In den Gemeinschafts-Schaukasten stellen"
       remove_admin: "Als Administrator entfernen"
       remove_moderator: "Als Moderator entfernen"
-      remove_spotlight: "Aus Interessante Leute entfernen"
+      remove_spotlight: "Aus dem Gemeinschafts-Schaukasten entfernen"
       role_implemented: "%{name} hat diese Rolle bereits erhalten!"
       role_removal_implemented: "%{name} wurde diese Rolle bereits entzogen!"
       under_13: "Zeige Benutzer, die unter 13 Jahre alt sind (COPPA)"
@@ -645,7 +645,6 @@ de:
       public_feed: "Öffentlicher diaspora* Feed von %{name}"
       source_package: "Quelltextpaket runterladen"
       statistics_link: "Pod-Statistiken"
-      toggle: "Mobile Ansicht umschalten"
       whats_new: "Was gibt’s Neues?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index fd05d1d8f..2753af7de 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -627,7 +627,6 @@ de_formal:
       public_feed: "Öffentlicher diaspora* Feed von %{name}"
       source_package: "Quelltextpaket herunterladen"
       statistics_link: "Pod-Statistiken"
-      toggle: "Mobile Ansicht umschalten"
       whats_new: "Was gibt’s Neues?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 70a782e18..d3dd49eba 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -290,7 +290,6 @@ el:
       powered_by: "Powered by diaspora*"
       public_feed: "Δημόσια ανατροφοδότηση (feed) του diaspora* για τον χρήστη %{name}"
       source_package: "Μεταφορτώστε το πακέτο του πηγαίου κώδικα"
-      toggle: "Αλλαγή σε κινητό"
       whats_new: "Τι νέα;"
     header:
       code: "Κώδικας"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index fe86d2fa4..88ee05b20 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -20,6 +20,7 @@ en:
   email: "Email"
   are_you_sure: "Are you sure?"
   are_you_sure_delete_account: "Are you sure you want to close your account? This can’t be undone!"
+  are_you_sure_ignore_user: "You are going to ignore that user. Are you sure?"
   fill_me_out: "Fill me out"
   public: "Public"
   limited: "Limited"
@@ -615,7 +616,8 @@ en:
       whats_new: "What’s new?"
       statistics_link: "Pod statistics"
       discourse: "Project discussions and support"
-      toggle: "Toggle mobile"
+      switch_to_touch_optimized_mode: "Switch to touch-optimized mode"
+      switch_to_standard_mode: "Switch to standard mode"
       public_feed: "Public diaspora* feed for %{name}"
       back_to_top: "Back to top"
       source_package: "Download the source code package"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 5626766d5..f547e499c 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -226,7 +226,6 @@ en_1337:
       powered_by: "P0W3R3D BY D*"
       public_feed: "PUBL1C D* F33D F0R %{name}"
       source_package: "D0WNL04D 7H3 5AUC3"
-      toggle: "70GGL3 M0B1L3"
       whats_new: "WH475 N3W?"
     header:
       code: "C0D3"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index 0468d526d..cdd026664 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -190,7 +190,6 @@ en_pirate:
       powered_by: "This ship be POWERED BY diaspora*"
       public_feed: "Sea-wide diaspora* feed for %{name}"
       source_package: "Download the blueprints! Argh!"
-      toggle: "toggl' mobile site"
       whats_new: "what be new?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index e89763e61..a06872275 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -125,7 +125,6 @@ en_shaw:
     application:
       powered_by: "𐑐𐑬𐑮𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
       public_feed: "𐑐𐑳𐑚𐑤𐑦𐑒 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑰𐑛 𐑓𐑹 %{name}"
-      toggle: "𐑑𐑪𐑜𐑩𐑤 𐑥𐑴𐑚𐑩𐑤 𐑕𐑲𐑑"
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
     header:
       code: "𐑒𐑴𐑛"
diff --git a/config/locales/diaspora/en_valspeak.yml b/config/locales/diaspora/en_valspeak.yml
index cd2e140fb..5bd4e3c83 100644
--- a/config/locales/diaspora/en_valspeak.yml
+++ b/config/locales/diaspora/en_valspeak.yml
@@ -477,7 +477,6 @@ en_valspeak:
       public_feed: "the feed for %{name} that like... every1 can c n stuff"
       source_package: "dl code n stuff.."
       statistics_link: "Pod statz"
-      toggle: "make like... phone friendly..."
       whats_new: "sup?"
     header:
       code: "code"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index ce78dfebb..b51ad479c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -326,7 +326,6 @@ eo:
       powered_by: "FUNKCIAS PER DIASPORA*"
       public_feed: "Publika DIASPORA* Afiŝostrio de %{name}"
       source_package: "elŝutu la pakaĵon kun la fontkodo"
-      toggle: "ŝalti inter tiu kaj poŝtelefona versio"
       whats_new: "kio estas nova?"
     header:
       code: "kodo"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 04e778f48..7041e8082 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -611,7 +611,6 @@ es-AR:
       public_feed: "Canal público para %{name}"
       source_package: "Descargar el paquete con el código fuente"
       statistics_link: "Estadísticas del pod"
-      toggle: "Cambiar a celular"
       whats_new: "¿Qué hay de nuevo?"
     header:
       code: "Código"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index d40b18e7b..b111fe1fc 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -361,7 +361,6 @@ es-CL:
       powered_by: "POTENCIADO POR DIASPORA*"
       public_feed: "Canal publico de %{name}"
       source_package: "descargar paquete de código fuente"
-      toggle: "cambiar sitio móvil"
       whats_new: "¿Qué hay de nuevo?"
     header:
       code: "codigo"
diff --git a/config/locales/diaspora/es-CO.yml b/config/locales/diaspora/es-CO.yml
index 4194004dc..798eaa64d 100644
--- a/config/locales/diaspora/es-CO.yml
+++ b/config/locales/diaspora/es-CO.yml
@@ -156,7 +156,6 @@ es-CO:
     application:
       back_to_top: "Volver al principio"
       public_feed: "Canal público de Diaspora para %{name}"
-      toggle: "Cambiar a interfaz móvil"
       whats_new: "¿Qué hay de nuevo?"
     header:
       code: "código"
diff --git a/config/locales/diaspora/es-MX.yml b/config/locales/diaspora/es-MX.yml
index 2b3db80cb..bd87397be 100644
--- a/config/locales/diaspora/es-MX.yml
+++ b/config/locales/diaspora/es-MX.yml
@@ -312,6 +312,10 @@ es-MX:
       stream_full_of_posts_q: "¿Por qué está mi «Entrada» llena de publicaciones de gente que no conozco, y con las cuales no estoy compartiendo?"
       title: "Publicaciones y cómo publicar"
     private_posts:
+      can_comment_a: "Solo los usuarios de diaspora* que hayas agregado a ese aspecto podrán comentar o marcar \"Me gusta\" en tu publicación privada."
+      can_comment_q: "¿Quién puede comentar o dar \"Me gusta\" a mi publicación privada?"
+      can_reshare_a: "Nadie. Las publicaciones privadas no son re-compartibles. Sin embargo, los usuarios de diaspora* en ese aspecto pueden potencialmente copiar y pegarlo. Depende de si usted confía en esas personas."
+      can_reshare_q: "¿Quién puede volver a compartir mi publicación privada?"
       title: "Publicaciones privadas"
       who_sees_post_a: "Únicamente los usuarios de diaspora* que hayan iniciado sesión, y a quienes hayas añadido a dicho aspecto, podrán ver tu publicación limitada."
       who_sees_post_q: "¿Cuando publico un mensaje para un aspecto (es decir, una publicación privada) quién puede verlo?"
@@ -383,7 +387,6 @@ es-MX:
       powered_by: "POWERED BY diaspora*"
       public_feed: "Canal público de Diaspora para %{name}"
       source_package: "descargar el paquete del código fuente"
-      toggle: "Cambiar a sitio móvil"
       whats_new: "¿Qué hay de nuevo?"
     header:
       code: "código"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index efee8cd88..00929b83a 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -200,6 +200,7 @@ es:
         tos: "Ver los Términos de Servicio de la aplicación"
   are_you_sure: "¿Estás seguro?"
   are_you_sure_delete_account: "¿Seguro que quieres eliminar tu cuenta? ¡Esto no se podrá deshacer!"
+  are_you_sure_ignore_user: "Vas a bloquear a este usuario. ¿Estás seguro?"
   aspect_memberships:
     destroy:
       failure: "No se pudo quitar a la persona del aspecto."
@@ -637,7 +638,8 @@ es:
       public_feed: "Canal público de %{name} "
       source_package: "Descargar el paquete del código fuente"
       statistics_link: "Estadísticas del pod"
-      toggle: "Cambiar a interfaz móvil"
+      switch_to_standard_mode: "Cambiar al modo estándar"
+      switch_to_touch_optimized_mode: "Cambiar al modo optimizado para pantallas táctiles"
       whats_new: "Novedades"
     header:
       code: "Código"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 0f76decfc..420d46cfe 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -220,7 +220,6 @@ eu:
       back_to_top: "Gora"
       powered_by: "DIASPORAK ESKAINIA"
       public_feed: "%{name}(r)en Diaspora Feed publikoa"
-      toggle: "gaitu mugikorreko orrialdea"
       whats_new: "zer berri?"
     header:
       code: "kodea"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index f4ae23822..23540ef5a 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -601,7 +601,6 @@ fi:
       public_feed: "Käyttäjän %{name} julkinen Diaspora-uutisvirta"
       source_package: "Lataa lähdekoodipaketti"
       statistics_link: "Podin tilastot"
-      toggle: "Mobiilisivusto päälle/pois"
       whats_new: "Uutta"
     header:
       code: "Lähdekoodi"
diff --git a/config/locales/diaspora/fil.yml b/config/locales/diaspora/fil.yml
index e3ceebe99..28af6a694 100644
--- a/config/locales/diaspora/fil.yml
+++ b/config/locales/diaspora/fil.yml
@@ -69,8 +69,6 @@ fil:
       no_contacts: "No contacts."
       title: "Mateys"
   layouts:
-    application:
-      toggle: "toggle mobile site"
     header:
       logout: "abandon ship"
       profile: "profile"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index e8e127e0f..64ca24f37 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -208,6 +208,7 @@ fr:
         tos: "Voir les conditions d'utilisation de l'application"
   are_you_sure: "Êtes-vous certain ?"
   are_you_sure_delete_account: "Souhaitez-vous vraiment supprimer votre compte ? Cette action est définitive !"
+  are_you_sure_ignore_user: "Vous êtes sur le point d'ignorer cet utilisateur. Êtes-vous sûr ?"
   aspect_memberships:
     destroy:
       failure: "La personne n'a pas pu être supprimée de l'aspect."
@@ -647,7 +648,8 @@ fr:
       public_feed: "Flux diaspora* public de %{name}"
       source_package: "Téléchargez le code source"
       statistics_link: "Statistiques du pod"
-      toggle: "Activer/désactiver la version mobile"
+      switch_to_standard_mode: "Utiliser la version classique"
+      switch_to_touch_optimized_mode: "Utiliser la version tactile"
       whats_new: "Quoi de neuf ?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 7aef31cf0..c7c586103 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -286,7 +286,6 @@ he:
       powered_by: "מופעל על ידי דיאספורה*"
       public_feed: "פרסומים ציבוריים בדיאספורה* מאת %{name}"
       source_package: "הורדת חבילת קוד המקור"
-      toggle: "הפעלה/כיבוי תצוגת מכשיר נייד"
       whats_new: "מה חדש?"
     header:
       code: "קוד"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 3b69533bc..fa9c5cb52 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -488,7 +488,6 @@ hu:
       public_feed: "%{name} nyilvános diaspora* hírfolyama"
       source_package: "forráskódcsomag letöltése"
       statistics_link: "pod statisztika"
-      toggle: "mobil változat"
       whats_new: "mik az újdonságok?"
     header:
       code: "kód"
diff --git a/config/locales/diaspora/hye-classical.yml b/config/locales/diaspora/hye-classical.yml
index 688aad6dd..dc917cdfd 100644
--- a/config/locales/diaspora/hye-classical.yml
+++ b/config/locales/diaspora/hye-classical.yml
@@ -619,7 +619,6 @@ hye-classical:
       public_feed: "%{name}-ի` դիասպորա*֊ի հրապարակային հոսքը"
       source_package: "Ներբեռնել սկզբնական կոդի փաթեթը"
       statistics_link: "Հանգոյցի վիճակագրութիւն"
-      toggle: "Դիւրակիր տարբերակը"
       whats_new: "Ի՞նչ կա"
     header:
       code: "Կոդ"
diff --git a/config/locales/diaspora/hye.yml b/config/locales/diaspora/hye.yml
index eaf9bd2c4..7e3995e40 100644
--- a/config/locales/diaspora/hye.yml
+++ b/config/locales/diaspora/hye.yml
@@ -616,7 +616,6 @@ hye:
       public_feed: "%{name}-ի` դիասպորա*յի հրապարակային հոսքը"
       source_package: "Ներբեռնել սկզբնական կոդի փաթեթը"
       statistics_link: "Հանգույցի վիճակագրություն"
-      toggle: "Դյուրակիր տարբերակը"
       whats_new: "Ի՞նչ կա"
     header:
       code: "Կոդ"
diff --git a/config/locales/diaspora/hyw.yml b/config/locales/diaspora/hyw.yml
index 2556f7bfc..e706e0454 100644
--- a/config/locales/diaspora/hyw.yml
+++ b/config/locales/diaspora/hyw.yml
@@ -152,7 +152,6 @@ hyw:
       back_to_top: "Թռիլ վեր"
       powered_by: "Կ՚աշխատի տիասփորա*-ի օգնութեամբ"
       public_feed: "%{name}-ին` տիասփորա*-ի հրապարակային հոսքը"
-      toggle: "Դիւրակիր տարբերակ"
       whats_new: "Ի՞նչ կայ չկայ"
     header:
       code: "Քոտ"
diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml
index 5eeecbba1..7a8401808 100644
--- a/config/locales/diaspora/ia.yml
+++ b/config/locales/diaspora/ia.yml
@@ -190,6 +190,7 @@ ia:
         tos: "Vider le conditiones de servicio del application"
   are_you_sure: "Es tu secur?"
   are_you_sure_delete_account: "Es tu secur de voler clauder tu conto? Isto non pote esser disfacite!"
+  are_you_sure_ignore_user: "Tu va ignorar iste usator. Es tu secur?"
   aspect_memberships:
     destroy:
       failure: "Le remotion del persona del aspecto ha fallite."
@@ -627,7 +628,8 @@ ia:
       public_feed: "Fluxo public de diaspora* pro %{name}"
       source_package: "Discargar le pacchetto con le codice-fonte"
       statistics_link: "Statisticas del pod"
-      toggle: "(Dis)activar mobile"
+      switch_to_standard_mode: "Cambiar al modo standard"
+      switch_to_touch_optimized_mode: "Cambiar al modo tactile"
       whats_new: "Que es nove?"
     header:
       code: "Codice"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 30b2a8476..04a7307ec 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -160,7 +160,6 @@ id:
     application:
       back_to_top: "Kembali ke atas"
       powered_by: "DIDUKUNG OLEH diaspora*"
-      toggle: "toggle mobile site"
       whats_new: "apa yang baru?"
     header:
       code: "Kode"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 0366bdc9c..80ed8eea9 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -200,7 +200,6 @@ is:
       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:
       code: "kóði"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 156fc9ce6..5ca893ce6 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -498,7 +498,6 @@ it:
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Feed pubblici diaspora* di %{name}"
       source_package: "Scaricare pacchetto fonte"
-      toggle: "Attiva/disattiva versione mobile"
       whats_new: "Novità?"
     header:
       code: "Codice"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 93541074a..154ead78e 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -619,7 +619,6 @@ ja:
       public_feed: "%{name}さんの公開ダイアスポラフィード"
       source_package: "ソースコードのパッケージをダウンロードする"
       statistics_link: "ポッドの統計"
-      toggle: "携帯サイトの切り替え"
       whats_new: "更新履歴"
     header:
       code: "ソース"
diff --git a/config/locales/diaspora/ka.yml b/config/locales/diaspora/ka.yml
index 86e49e9ff..56e5d4635 100644
--- a/config/locales/diaspora/ka.yml
+++ b/config/locales/diaspora/ka.yml
@@ -164,7 +164,6 @@ ka:
       back_to_top: "დასაწყისში დაბრუნება"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "გახდი მობილური"
       whats_new: "რა არის ახალი?"
     header:
       code: "კოდი"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index ca0b5ad90..d93a23310 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -255,7 +255,6 @@ ko:
       powered_by: "디아스포라* 제공"
       public_feed: "%{name}님의 공개 디아스포라 피드"
       source_package: "소스코드 패키지 다운로드"
-      toggle: "모바일"
       whats_new: "새로운 점"
     header:
       code: "코드"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 9d9fa0459..c2353d40c 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -156,7 +156,6 @@ lt:
       back_to_top: "Į viršų"
       powered_by: "TINKLAPĮ LEIDŽIA DIASPORA*"
       public_feed: "Viešas atsiliepimas apie Diaspora %{name}"
-      toggle: "toggle mobile site"
       whats_new: "Kas naujo?"
     header:
       code: "kodas"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index e230b2afb..41e56a7b8 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -110,8 +110,6 @@ mk:
       language: "Јазик"
       send_an_invitation: "Испрати покана"
   layouts:
-    application:
-      toggle: "toggle mobile site"
     header:
       code: "код"
       logout: "одјави се"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 8633b3057..13046e5c7 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -346,7 +346,6 @@ ml:
       powered_by: "ഡയാസ്പുറയാല്‍* ശക്തമാക്കിയത്"
       public_feed: "%{name} -ന്റെ പൊതു ഡയസ്പോറ ഫീഡ്"
       source_package: "സോഴ്സ് കോഡ് പൊതിക്കെട്ട് സൂക്ഷിക്കുക"
-      toggle: "മൊബൈല്‍ സൈറ്റിലേക്ക് മാറുക"
       whats_new: "പുതിയത്?"
     header:
       code: "കോഡ്"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 45171ff4b..eeb81e78e 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -137,8 +137,8 @@ nb:
         zero: "%{count} brukere funnet"
       view_profile: "Vis profil"
       you_currently:
-        one: "du har en invitasjon igjen %{link}"
-        other: "du har %{count} invitasjoner igjen %{link}"
+        one: "Du har én invitasjon igjen %{link}"
+        other: "Du har %{count} invitasjoner igjen %{link}"
         zero: "Du har ingen invitasjoner igjen %{link}"
     weekly_user_stats:
       amount_of:
@@ -641,7 +641,6 @@ nb:
       public_feed: "Offentlig diaspora*-feed for %{name}"
       source_package: "Last ned kildekoden"
       statistics_link: "Statistikk for belgen"
-      toggle: "Vis mobilsiden"
       whats_new: "Hva er nytt?"
     header:
       code: "Kode"
@@ -663,11 +662,8 @@ nb:
       other: "%{actors} har også kommentert på %{post_author}s %{post_link}."
       zero: "%{actors} har også kommentert på %{post_author}s %{post_link}."
     also_commented_deleted:
-      few: "%{actors} kommenterte på en slettet post."
-      many: "%{actors} kommenterte på en slettet post."
       one: "%{actors} kommenterte på en slettet post."
       other: "%{actors} kommenterte på en slettet post."
-      two: "%{actors} kommenterte en slettet post."
       zero: "%{actors} kommenterte på en slettet post."
     comment_on_post:
       one: "%{actors} kommenterte innlegget ditt %{post_link}."
@@ -708,11 +704,8 @@ nb:
       other: "%{actors} liker ditt %{post_link}."
       zero: "%{actors} liker ditt %{post_link}."
     liked_post_deleted:
-      few: "%{actors} likte ditt innlegg du har slettet."
-      many: "%{actors} likte ditt innlegg du har slettet."
       one: "%{actors} likte innlegget du slettet."
       other: "%{actors} likte innlegget du slettet."
-      two: "%{actors} likte din slettede post."
       zero: "%{actors} likte innlegget du slettet."
     mentioned:
       one: "%{actors} har nevnt deg i %{post_link}."
@@ -740,11 +733,8 @@ nb:
       other: "%{actors} har delt din %{post_link}."
       zero: "%{actors} har delt din %{post_link}."
     reshared_post_deleted:
-      few: "%{actors} har delt innlegget du slettet."
-      many: "%{actors} har delt innlegget du slettet."
       one: "%{actors} har delt innlegget du slettet."
       other: "%{actors} har delt innlegget du slettet."
-      two: "%{actors} delte din slettede post."
       zero: "%{actors} har delt innlegget du slettet."
     started_sharing:
       one: "%{actors} har begynt å dele med deg."
diff --git a/config/locales/diaspora/nds.yml b/config/locales/diaspora/nds.yml
index 72485a583..7d9882034 100644
--- a/config/locales/diaspora/nds.yml
+++ b/config/locales/diaspora/nds.yml
@@ -386,7 +386,6 @@ nds:
       public_feed: "Öffentliche diaspora*-Feed för %{name}"
       source_package: "Lod dat Quellcodepaket rünner"
       statistics_link: "Podstatistiken"
-      toggle: "Mobile Ansicht ümschalten"
       whats_new: "Wat gift dat Nee’es?"
     header:
       code: "Code"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index af4ac883c..eee6c634b 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -208,6 +208,7 @@ nl:
         tos: "Zie de gebruiksvoorwaarden van de applicatie"
   are_you_sure: "Weet je het zeker?"
   are_you_sure_delete_account: "Weet je zeker dat je jouw account wil sluiten? Dit kan niet teruggedraaid worden!"
+  are_you_sure_ignore_user: "Je staat op het punt deze gebruiker te negeren. Weet je het zeker?"
   aspect_memberships:
     destroy:
       failure: "Persoon verwijderen uit aspect mislukt"
@@ -636,7 +637,8 @@ nl:
       public_feed: "Publieke diaspora* kanaal van %{name}"
       source_package: "Download het broncode pakket"
       statistics_link: "Pod statistieken"
-      toggle: "Switch mobiele versie"
+      switch_to_standard_mode: "Schakel over naar de standaardmodus"
+      switch_to_touch_optimized_mode: "Schakel over naar de aanraakmodus"
       whats_new: "Wat is nieuw op Diaspora?"
     header:
       code: "Code"
@@ -713,7 +715,6 @@ nl:
     mentioned_deleted:
       one: "%{actors} heeft jou vermeld in een verwijderde post."
       other: "%{actors} hebben jou vermeld in een verwijderde post."
-      zero: "%{actors} heeft jou vermeld in een verwijderde post."
     mentioned_in_comment:
       one: "%{actors} heeft je vermeld in een <a href=%{comment_path}>reactie</a> op bericht %{post_link}"
       other: "%{actors} hebben je vermeld in een <a href=%{comment_path}>reactie</a> op bericht %{post_link}"
@@ -1068,12 +1069,8 @@ nl:
       mobile_row_checked: "%{name} (verwijderen)"
       mobile_row_unchecked: "%{name} (toevoegen)"
       toggle:
-        few: "In %{count} aspecten"
-        many: "In %{count} aspecten"
         one: "In %{count} aspect"
         other: "In %{count} aspecten"
-        two: "In %{count} aspecten"
-        zero: "Voeg contact toe"
     invitations:
       by_email: "Nodig mensen uit via e-mail"
       invite_your_friends: "Nodig je vrienden uit"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 8d6772735..12900bb09 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -281,7 +281,6 @@ nn:
       powered_by: "DRIVEN AV DIASPORA*"
       public_feed: "Offentleg Diaspora-straum for %{name}"
       source_package: "last ned kjeldekodepakka"
-      toggle: "slå på mobilnettstad"
       whats_new: "kva er nytt?"
     header:
       code: "kode"
diff --git a/config/locales/diaspora/oc.yml b/config/locales/diaspora/oc.yml
index e14af12ee..9b5b4b398 100644
--- a/config/locales/diaspora/oc.yml
+++ b/config/locales/diaspora/oc.yml
@@ -130,6 +130,8 @@ oc:
       remove_admin: "Quitar d’èsser admin"
       remove_moderator: "Quitar d’èsser moderator"
       remove_spotlight: "Tirar dels especials de la comunitat"
+      role_implemented: "Òm a ja donat aquel ròtle a %{name} !"
+      role_removal_implemented: "Òm a ja tirat aquel ròtle a %{name} !"
       under_13: "Mostrar los utilizaires qu'an mens de 13 ans (COPPA)"
       unlock_account: "Desverrolhar lo compte"
       users:
@@ -206,6 +208,7 @@ oc:
         tos: "Veire las condicions d'utilizacion de l'aplicacion"
   are_you_sure: "Sètz segur ?"
   are_you_sure_delete_account: "Sètz segur que volètz tampar vòstre compte ? Aquò se pòt pas anullar !"
+  are_you_sure_ignore_user: "Sètz per ignorar aquel utilizaire. Confirmatz ?"
   aspect_memberships:
     destroy:
       failure: "La persona a pas pogut èsser levada de l'aspècte amb succès."
@@ -645,7 +648,8 @@ oc:
       public_feed: "Flux diaspora* public per %{name}"
       source_package: "Telecargatz lo còdi font"
       statistics_link: "Estatisticas del pod"
-      toggle: "Activar/desactivar la version mobila"
+      switch_to_standard_mode: "Passar al mòde estandard"
+      switch_to_touch_optimized_mode: "Passar al mòde optimizat pel tactil"
       whats_new: "Qué de nòu ?"
     header:
       code: "Còdi"
@@ -1224,6 +1228,7 @@ oc:
       new_password: "Senhal novèl"
       private_message: "avètz recebut un messatge privat."
       protocol_handler:
+        browser: "Aqueste protocòl es a una etapa experimentala e lo bon foncionament de las interraccions depend del navigador. Se volètz gerir o tirar aqueste gestionari, avètz d’utilizar los paramètres del navegador. Lo boton çai-jos serà totjorn activat, vos caldrà configurar lo gestionari a despart en cada navegador qu’utilizatz."
         description: "Clicatz lo boton per configurar lo navegador per permetre la dobertura de las URL web+diaspora:// a partir de vòstre pod preferit. Aquò es experimental pel moment e las interaccions dependràn de vòstre navegador."
         register: "Enregistrar"
         title: "Gestionari de protocòl web+diaspora://"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 7bf693c42..488d6b296 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -51,7 +51,6 @@ pa:
   find_people: "Find people"
   layouts:
     application:
-      toggle: "toggle mobile site"
       whats_new: "ਨਵਾਂ ਕੀ ਹੈ?"
     header:
       code: "ਕੋਡ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index b32565237..87f8a41eb 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -627,7 +627,6 @@ pl:
       public_feed: "Publiczny kanał diaspory* użytkownika %{name}"
       source_package: "Pobierz archiwum z kodem źródłowym"
       statistics_link: "Statystyki poda"
-      toggle: "Przełącz widok mobilny"
       whats_new: "Co nowego?"
     header:
       code: "Kod"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index a2026d5fc..68344f888 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -90,15 +90,18 @@ pt-BR:
       week: "Semana"
     user_entry:
       account_closed: "Conta encerrada"
+      admin: "Admin"
       diaspora_handle: "diaspora* ID"
       email: "Email"
       guid: "GUID"
       id: "ID"
       invite_token: "Convite"
       last_seen: "Última visita"
+      moderator: "Moderação"
       ? "no"
       : Não
       nsfw: "#nsfw"
+      spotlight: "Destaque"
       unknown: "Desconhecido"
       ? "yes"
       : Sim
@@ -106,14 +109,29 @@ pt-BR:
       account_closing_scheduled: "A conta de %{name} está programada para ser encerrada. Isto acontecerá em alguns instantes..."
       account_locking_scheduled: "A conta de %{name} será bloqueada em instantes."
       account_unlocking_scheduled: "A conta de %{name} será desbloqueada em instantes."
+      add_admin: "%{name} agora é admin."
       add_invites: "Adicionar convites"
+      add_moderator: "%{name} agora faz parte da moderação."
+      add_spotlight: "%{name} entrou para o Destaque da Comunidade."
       are_you_sure: "Tem certeza que deseja encerrar esta conta?"
       are_you_sure_lock_account: "Tem certeza de que deseja bloquear esta conta?"
       are_you_sure_unlock_account: "Tem certeza de que deseja desbloquear esta conta?"
       close_account: "Encerrar conta"
+      delete_admin: "%{name} não é mais admin."
+      delete_moderator: "%{name} não faz mais parte da moderação."
+      delete_spotlight: "%{name} saiu do Destaque da Comunidade."
+      does_not_exist: "Essa conta não existe!"
       email_to: "E-mail para convidar"
       invite: "Convidar"
       lock_account: "Bloquear conta"
+      make_admin: "Tornar admin"
+      make_moderator: "Tornar moderação"
+      make_spotlight: "Adicionar ao Destaque da Comunidade"
+      remove_admin: "Remover da administração"
+      remove_moderator: "Remover da moderação"
+      remove_spotlight: "Remover do Destaque da Comunidade"
+      role_implemented: "%{name} já recebeu essa função!"
+      role_removal_implemented: "%{name} já perdeu essa função!"
       under_13: "Mostrar usuários menores de 13 anos"
       unlock_account: "Desbloquear conta"
       users:
@@ -190,6 +208,7 @@ pt-BR:
         tos: "Ver termos de serviço do aplicativo"
   are_you_sure: "Tem certeza?"
   are_you_sure_delete_account: "Tem certeza de que deseja cancelar sua conta? Isso não poderá ser desfeito!"
+  are_you_sure_ignore_user: "Você vai ignorar esse usuário. Tem certeza?"
   aspect_memberships:
     destroy:
       failure: "Falha ao remover pessoa do aspecto."
@@ -249,7 +268,7 @@ pt-BR:
         heading: "Conecte-se"
       welcome_to_diaspora: "Bem-vindo(a) a diaspora*, %{name}!"
     no_contacts_message:
-      community_spotlight: "Destaques da Comunidade"
+      community_spotlight: "Destaque da Comunidade"
       invite_link_text: "convidar"
       or_spotlight: "Ou você pode compartilhar com %{link}"
       try_adding_some_more_contacts: "Você pode buscar ou %{invite_link} mais pessoas."
@@ -627,7 +646,8 @@ pt-BR:
       public_feed: "Feed público de diaspora* para %{name}"
       source_package: "Baixar pacote do código-fonte"
       statistics_link: "Estatísticas do servidor"
-      toggle: "Versão móvel"
+      switch_to_standard_mode: "Alternar para modo padrão"
+      switch_to_touch_optimized_mode: "Alternar para modo tátil"
       whats_new: "O que há de novo?"
     header:
       code: "Código"
@@ -1204,8 +1224,9 @@ pt-BR:
       new_password: "Nova senha"
       private_message: "você receber uma mensagem privada"
       protocol_handler:
-        description: "Ao clicar nesse botão, você solicitará ao navegador a instalação de um protocolo que permitirá abrir URLs web+diaspora:// no seu servidor nativo. Atualmente, esse recurso é experimental, e possíveis interações dependerão do seu navegador."
-        register: "Registrar"
+        browser: "Esse protocolo está atualmente em estágio experimental e o sucesso das suas interações ao usá-lo dependerá do seu navegador. Se você quiser gerenciá-lo ou removê-lo, acesse as configurações do seu navegador. O botão abaixo estará sempre ativo, e você deve configurar o protocolo separadamente em cada navegador que utilizar."
+        description: "web+diaspora:// é um protocolo web que estamos introduzindo. Qualquer link de página na diaspora* que o utilize, em site externo, poderá ser aberto no pod no qual sua conta diaspora* está registrada. Clique no botão abaixo para configurar seu navegador de modo a usar %{pod_url} para reconhecer links web+diaspora:// externos."
+        register: "Registrar protocolo web+diaspora:// neste navegador"
         title: "protocolo web+diaspora://"
       receive_email_notifications: "Receber notificações por e-mail quando:"
       request_export: "Solicitar dados do meu perfil"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 6179c4e7a..9a2e15905 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -500,7 +500,6 @@ pt-PT:
       public_feed: "Fonte pública do diaspora* para %{name}"
       source_package: "Transferir o pacote de código fonte"
       statistics_link: "Estatísticas do servidor"
-      toggle: "Alternar móvel"
       whats_new: "O que há de novo?"
     header:
       code: "Código"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index d8467d37f..b1ac52529 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -138,6 +138,8 @@ ru:
       remove_admin: "Удалить администратора"
       remove_moderator: "Удалить модератора"
       remove_spotlight: "Удалить рекомендуемого пользователя"
+      role_implemented: "%{name} уже получил эту роль"
+      role_removal_implemented: "%{name} уже удалён из этой роли"
       under_13: "Показать пользователей моложе 13 (COPPA)"
       unlock_account: "Разблокировать учетную запись"
       users:
@@ -220,6 +222,7 @@ ru:
         tos: "Ознакомиться с условиями оказания услуг приложения"
   are_you_sure: "Вы уверены?"
   are_you_sure_delete_account: "Вы уверены, что хотите закрыть свой аккаунт? Эту процедуру будет невозможно отменить!"
+  are_you_sure_ignore_user: "Вы будете игнорировать этого пользователя. Вы уверены?"
   aspect_memberships:
     destroy:
       failure: "Не удалось удалить пользователя из аспекта."
@@ -659,7 +662,8 @@ ru:
       public_feed: "Публичный поток %{name} в Диаспоре"
       source_package: "скачать исходный код"
       statistics_link: "Статистика пода"
-      toggle: "Обычный/мобильный"
+      switch_to_standard_mode: "Включить обычный режим"
+      switch_to_touch_optimized_mode: "Включить сенсорный режим"
       whats_new: "Что нового?"
     header:
       code: "Код"
@@ -1275,9 +1279,10 @@ ru:
       new_password: "Новый пароль"
       private_message: "вы получили личное сообщение"
       protocol_handler:
+        browser: "Этот протокол в настоящий момент в экспериментальной фазе и эффективность работы с ним будет зависеть от вашего браузера. Если вы хотите настроить или удалить его обработчик, сделайте это через настройки браузера. Кнопка ниже будет доступна всегда и вам нужно будет настроить обработчик для каждого используемого вами браузера."
         description: "web+ diaspora:// — это наш новый веб-протокол. Любую ссылку на страницу diaspora* на использующем этот протокол внешнем веб-сайте можно открыть в стручке, где зарегистрирован ваш аккаунт. Нажмите кнопку ниже, чтобы в вашем браузере для распознавания внешних ссылок web+ diaspora:// применялся %{pod_url}."
         register: "Зарегистрировать обработчик web+diaspora:// в этом браузере"
-        title: "Обработчик протокола WWW+diaspora://"
+        title: "Обработчик протокола web+diaspora://"
       receive_email_notifications: "Получать уведомление по электронной почте, если:"
       request_export: "Запросить данные из моего профиля"
       request_export_photos: "Запросить мои фотографии"
diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml
index f816fb9e8..e76aa0799 100644
--- a/config/locales/diaspora/sc.yml
+++ b/config/locales/diaspora/sc.yml
@@ -208,6 +208,7 @@ sc:
         tos: "Abbista sos tèrmines de servìtziu de s'aplicatzione"
   are_you_sure: "Seguru ses?"
   are_you_sure_delete_account: "Seguru ses de bòlere serrare su contu tuo? Est una cosa chi non podet èssere annullada!"
+  are_you_sure_ignore_user: "As a ignorare custu impreadore. Seguru ses?"
   aspect_memberships:
     destroy:
       failure: "No est istadu possìbile bogare sa persone dae sa cara."
@@ -645,7 +646,8 @@ sc:
       public_feed: "Flussu de diaspora* pùblicu de %{name}"
       source_package: "Iscàrriga su pachete de su còdighe mitza"
       statistics_link: "Istatìsticas pod"
-      toggle: "Allughe/istuda sa versione mòbile"
+      switch_to_standard_mode: "Cola a sa modalidade predefinida"
+      switch_to_touch_optimized_mode: "Cola a sa modalidade tàtile otimizada"
       whats_new: "Ite b'est de nou?"
     header:
       code: "Còdighe"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 80e4fc93d..ac4da3b6b 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -340,7 +340,6 @@ sk:
       powered_by: "Poháňané Diasporou*"
       public_feed: "Verejný kanál diaspory* pre %{name}"
       source_package: "Stiahnuť balík so zdrojovým kódom"
-      toggle: "Prepnúť /na/ mobilnú verziu"
       whats_new: "Čo je nové?"
     header:
       code: "Kód"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index fea4bfe97..37e72e04f 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -246,7 +246,6 @@ sl:
       powered_by: "STRAN POGANJA DIASPORA*"
       public_feed: "Javni vir Diaspore za %{name}"
       source_package: "prenesi paket izvorne kode"
-      toggle: "preklop mobilne strani"
       whats_new: "kaj je novega?"
     header:
       code: "izvorna koda"
diff --git a/config/locales/diaspora/sr.yml b/config/locales/diaspora/sr.yml
index 0592d1d7f..0c10d27f7 100644
--- a/config/locales/diaspora/sr.yml
+++ b/config/locales/diaspora/sr.yml
@@ -146,7 +146,6 @@ sr:
     application:
       back_to_top: "Назад на врх"
       powered_by: "Покреће diaspora*"
-      toggle: "Мобилна верзија"
       whats_new: "Ново"
     header:
       code: "Код"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 31a66e834..f7266bb75 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -627,7 +627,6 @@ sv:
       public_feed: "Offentligt Diaspora*-flöde för %{name}"
       source_package: "Ladda ned källkodspaketet"
       statistics_link: "Serverstatistik"
-      toggle: "Slå om mobiltelefonanpassning"
       whats_new: "Vad är nytt?"
     header:
       code: "Källkod"
diff --git a/config/locales/diaspora/te.yml b/config/locales/diaspora/te.yml
index 9fff98aa4..d38e5a34c 100644
--- a/config/locales/diaspora/te.yml
+++ b/config/locales/diaspora/te.yml
@@ -88,6 +88,7 @@ te:
       are_you_sure: "మీరు ఖచ్ఛితంగా ఈ ఖాతాను మూసివేయాలనుకుంటున్నారా?"
       close_account: "ఖాతాను మూసివేయండి"
       email_to: "ఆహ్వానించుటకు ఈమెయిలు చేయండి"
+      under_13: "13 (COPPA) కింద ఉన్న వినియోగదారులను చూపించండి"
       users:
         one: "%{count} వాడుకరి కనబడ్డారు"
         other: "%{count} వాడుకరులు కనబడ్డారు"
@@ -380,7 +381,6 @@ te:
       public_feed: "%{name} కొరకు బహిరంగ డయాస్పోరా* ఫీడు"
       source_package: "సోర్సు కోడ్ ప్యాకేజీని దింపుకోండి"
       statistics_link: "పాడ్ గణాంకాలు"
-      toggle: "మొబైలులా చూడు"
       whats_new: "కొత్తగా ఏమున్నాయి?"
     header:
       code: "సంకేతం"
@@ -643,6 +643,7 @@ te:
     create:
       already_authorized: "డయాస్పోరా గుచి %{diaspora_id}తో ఒక వాడుకరి ఇదివరకే %{service_name} ఖాతాను ధృవీకరించారు."
       failure: "ధృవీకరణ విఫలం."
+      read_only_access: "ప్రాప్యత స్థాయి చదవడానికి-మాత్రమే, దయచేసి తరువాత మళ్ళీ అధికారం ఇవ్వడానికి ప్రయత్నించండి"
       success: "ధృవీకరణ విజయవంతం."
     destroy:
       success: "ధృవీకరణ విజయవంతంగా తొలగించబడింది."
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index b6a9877cb..0a7234b1b 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -394,7 +394,6 @@ tr:
       powered_by: "GELİŞTİREN: DIASPORA*"
       public_feed: "%{name} için Genel Diaspora* Beslemesi"
       source_package: "kaynak kodu paketini indir"
-      toggle: "mobil site"
       whats_new: "neler yeni?"
     header:
       code: "kod"
diff --git a/config/locales/diaspora/tt.yml b/config/locales/diaspora/tt.yml
index 2ebd185f0..f2da874bc 100644
--- a/config/locales/diaspora/tt.yml
+++ b/config/locales/diaspora/tt.yml
@@ -91,7 +91,6 @@ tt:
       back_to_top: "Артка, өс биткә"
       powered_by: "diaspora*да эшли"
       public_feed: "%{name} өчен җәмәгый diaspora* feed тасмасы"
-      toggle: "Кәрәзле режимга күчерү"
       whats_new: "Нәрсә яңа?"
     header:
       code: "Коды"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 63b539752..b14e95921 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -222,6 +222,7 @@ uk:
         tos: "Дивись умови використання додатку"
   are_you_sure: "Ви впевнені?"
   are_you_sure_delete_account: "Ви впевнені, що хочете закрити свій обліковий запис? Цю процедуру неможливо скасувати!"
+  are_you_sure_ignore_user: "Ви збираєтеся ігнорувати цього користувача. Ви впевнені?"
   aspect_memberships:
     destroy:
       failure: "Не вдалося видалити користувача з аспекту"
@@ -644,7 +645,8 @@ uk:
       public_feed: "Публічний канал діаспори підтримується для %{name}"
       source_package: "завантажити початковий код"
       statistics_link: "Статистика поду"
-      toggle: "Звичайний/мобільний"
+      switch_to_standard_mode: "Перемкнутися на стандартний режим"
+      switch_to_touch_optimized_mode: "Перемкнутися на режим, оптимізований для дотиків"
       whats_new: "Що нового?"
     header:
       code: "Код"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 7fe908ea2..c322c8834 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -81,8 +81,6 @@ ur-PK:
     index:
       no_contacts: "No contacts."
   layouts:
-    application:
-      toggle: "toggle mobile site"
     header:
       logout: "log out"
       profile: "profile"
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 6906a98bb..e2b05090f 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -227,7 +227,6 @@ vi:
       powered_by: "ĐƯỢC HỖ TRỢ BỞI DIASPORA*"
       public_feed: "Nguồn tin Diaspora công khai cho %{name}"
       source_package: "tải về gói mã nguồn"
-      toggle: "bật/tắt di động"
       whats_new: "có gì mới?"
     header:
       code: "mã nguồn"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index eb13baf33..db8039dde 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -267,7 +267,6 @@ zh-CN:
       powered_by: "Powered by DIASPORA*"
       public_feed: "%{name} 的 Diaspora RSS 订阅"
       source_package: "下载源代码包"
-      toggle: "切换到手机版"
       whats_new: "有什么新鲜事？"
     header:
       code: "源码"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index e231bd193..894d37943 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -619,7 +619,6 @@ zh-TW:
       public_feed: "%{name} 在 diaspora* 的公開資訊源"
       source_package: "下載源碼封裝檔"
       statistics_link: "豆莢統計資料"
-      toggle: "切換行動版頁面"
       whats_new: "更新了什麼？"
     header:
       code: "源碼"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 308b478b5..a6567e9db 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -75,7 +75,6 @@ cs:
         few: "Ve <%= count %> aspektech"
         one: "V <%= count %> aspektu"
         other: "V <%= count %> aspektech"
-        zero: "V <%= count %> aspektech"
       updating: "aktualizuji..."
     aspect_navigation:
       add_an_aspect: "+ Přidat aspekt"
@@ -140,7 +139,7 @@ cs:
       recent_notifications: "Nedávná oznámení"
       search: "Hledat"
       settings: "Nastavení"
-      toggle_mobile: "Vybrat mobil"
+      switch_to_touch_optimized_mode: "Přepnutí do režimu dotykového displeje"
       toggle_navigation: "Vybrat navigaci"
       view_all: "Zobrazit vše"
     hide_post: "Skrýt tento příspěvek"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index abb257e3f..53c645d05 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -133,7 +133,6 @@ da:
       recent_notifications: "Seneste notifikationer"
       search: "Søg"
       settings: "Indstillinger"
-      toggle_mobile: "Slå mobil til/fra"
       toggle_navigation: "Slå navigation til/fra"
       view_all: "Se alle"
     hide_post: "Skjul dette indlæg?"
diff --git a/config/locales/javascript/javascript.de-moo.yml b/config/locales/javascript/javascript.de-moo.yml
index 60bf632a7..a717589ab 100644
--- a/config/locales/javascript/javascript.de-moo.yml
+++ b/config/locales/javascript/javascript.de-moo.yml
@@ -133,7 +133,6 @@ de-moo:
       recent_notifications: "Neueste Benachrichtigungen"
       search: "Suche"
       settings: "Einstellungen"
-      toggle_mobile: "Mobile Ansicht umschalten"
       toggle_navigation: "Navigation umschalten"
       view_all: "Alle anzeigen"
     hide_post: "Diesen Beitrag ausblenden?"
@@ -311,6 +310,7 @@ de-moo:
       seconds: "weniger als eine Minute"
       suffixAgo: ""
       suffixFromNow: "ab jetzt"
+      wordSeparator: ""
       year: "etwa einem Jahr"
       years:
         one: "einem Jahr"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index f43428bd0..5903b4129 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -133,7 +133,6 @@ de:
       recent_notifications: "Neuste Benachrichtigungen"
       search: "Suchen"
       settings: "Einstellungen"
-      toggle_mobile: "Mobile Ansicht umschalten"
       toggle_navigation: "Navigation umschalten"
       view_all: "Alle anzeigen"
     hide_post: "Diesen Beitrag ausblenden?"
diff --git a/config/locales/javascript/javascript.de_formal.yml b/config/locales/javascript/javascript.de_formal.yml
index 269eb72b0..62fc75b68 100644
--- a/config/locales/javascript/javascript.de_formal.yml
+++ b/config/locales/javascript/javascript.de_formal.yml
@@ -133,7 +133,6 @@ de_formal:
       recent_notifications: "Letzte Benachrichtigungen"
       search: "Find people or #tags"
       settings: "Einstellungen"
-      toggle_mobile: "Mobile Ansicht umschalten"
       toggle_navigation: "Navigation umschalten"
       view_all: "Alle ansehen"
     hide_post: "Diesen Beitrag ausblenden?"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index b935267b5..372d26705 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -311,7 +311,7 @@ en:
       moderator: "Moderator"
       log_out: "Log out"
       toggle_navigation: "Toggle navigation"
-      toggle_mobile: "Toggle mobile"
+      switch_to_touch_optimized_mode: "Switch to touch-optimized mode"
 
       notifications: "Notifications"
       conversations: "Conversations"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index c5de410bc..bcf942300 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -134,7 +134,6 @@ es-AR:
       recent_notifications: "Notificaciones recientes"
       search: "Buscar"
       settings: "Opciones"
-      toggle_mobile: "Interfaz móvil"
       toggle_navigation: "Cambiar navegación"
       view_all: "Ver todo"
     hide_post: "¿Ocultar esta publicación?"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 4bdef12c2..b33dcc9f0 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -134,7 +134,7 @@ es:
       recent_notifications: "Notificaciones recientes"
       search: "Buscar"
       settings: "Ajustes"
-      toggle_mobile: "Interfaz móvil"
+      switch_to_touch_optimized_mode: "Cambiar al modo optimizado para pantallas táctiles"
       toggle_navigation: "Cambiar navegación"
       view_all: "Ver todo"
     hide_post: "Ocultar esta publicación?"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 047a0cee5..b4062eab7 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -134,7 +134,6 @@ fi:
       recent_notifications: "Tuoreet ilmoitukset"
       search: "Etsi"
       settings: "Asetukset"
-      toggle_mobile: "Mobiilisivusto päälle/pois"
       toggle_navigation: "Navigaatio päälle/pois"
       view_all: "Näytä kaikki"
     hide_post: "Piilota tämä julkaisu?"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index c4686d51e..3817f38b2 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -133,7 +133,7 @@ fr:
       recent_notifications: "Notifications récentes"
       search: "Trouver des personnes ou #tags"
       settings: "Paramètres"
-      toggle_mobile: "Activer/désactiver la version mobile"
+      switch_to_touch_optimized_mode: "Utiliser la version tactile"
       toggle_navigation: "Afficher/cacher le menu"
       view_all: "Tout afficher"
     hide_post: "Masquer ce message ?"
diff --git a/config/locales/javascript/javascript.hye-classical.yml b/config/locales/javascript/javascript.hye-classical.yml
index 501c3bc8f..d5c5fed54 100644
--- a/config/locales/javascript/javascript.hye-classical.yml
+++ b/config/locales/javascript/javascript.hye-classical.yml
@@ -134,7 +134,6 @@ hye-classical:
       recent_notifications: "Վերջին ծանուցումները"
       search: "Որոնում"
       settings: "Կարգաւորումներ"
-      toggle_mobile: "Միացնել/անջատել դիւրակիր տարբերակը"
       toggle_navigation: "Միացնել/անջատել նաւարկումը"
       view_all: "Ցուցադրել ամբողջը"
     hide_post: "Թաքցնե՞լ այս գրառումը։"
diff --git a/config/locales/javascript/javascript.ia.yml b/config/locales/javascript/javascript.ia.yml
index 217b6598a..1e42d40a7 100644
--- a/config/locales/javascript/javascript.ia.yml
+++ b/config/locales/javascript/javascript.ia.yml
@@ -133,7 +133,7 @@ ia:
       recent_notifications: "Notificationes recente"
       search: "Cercar"
       settings: "Configuration"
-      toggle_mobile: "Alternar mobile"
+      switch_to_touch_optimized_mode: "Cambiar al modo tactile"
       toggle_navigation: "Alternar navigation"
       view_all: "Vider totes"
     hide_post: "Celar iste entrata?"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 2eb94eaaf..772b5f1ae 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -129,7 +129,6 @@ ja:
       recent_notifications: "最近の通知"
       search: "検索"
       settings: "設定"
-      toggle_mobile: "携帯サイトの切り替え"
       toggle_navigation: "ナビゲーションの切り替え"
       view_all: "全て見る"
     hide_post: "この投稿を非表示にしますか？"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index 4047e56ec..d1f315469 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -134,7 +134,6 @@ nb:
       recent_notifications: "Nylige varsel"
       search: "Søk"
       settings: "Innstillinger"
-      toggle_mobile: "Slå mobiltilpasning av/på"
       toggle_navigation: "Veksle navigasjon"
       view_all: "Vis alle"
     hide_post: "Gjem dette innlegget?"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index ce331224b..3dc2bc232 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -137,7 +137,7 @@ nl:
       recent_notifications: "Recente meldingen"
       search: "Zoek"
       settings: "Instellingen"
-      toggle_mobile: "Omschakelen mobiel"
+      switch_to_touch_optimized_mode: "Schakel over naar de aanraakmodus"
       toggle_navigation: "Omschakelen navigatie"
       view_all: "Bekijk alle"
     hide_post: "Dit bericht verbergen?"
diff --git a/config/locales/javascript/javascript.oc.yml b/config/locales/javascript/javascript.oc.yml
index 4ae07d64b..d856bdea4 100644
--- a/config/locales/javascript/javascript.oc.yml
+++ b/config/locales/javascript/javascript.oc.yml
@@ -134,7 +134,7 @@ oc:
       recent_notifications: "Administracion"
       search: "Recercar"
       settings: "Paramètres"
-      toggle_mobile: "Activar/desactivar la version mobila"
+      switch_to_touch_optimized_mode: "Passar al mòde optimizat pel tactil"
       toggle_navigation: "Afichar/amagar lo menú"
       view_all: "O veire tot"
     hide_post: "Amagar aquesta publicacion ?"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index 909a8c40a..94c7e83a3 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -135,7 +135,6 @@ pl:
       recent_notifications: "Ostatnie powiadomienia"
       search: "Szukaj"
       settings: "Ustawienia"
-      toggle_mobile: "Przełącz widok mobilny"
       toggle_navigation: "Przełącz nawigację"
       view_all: "Wyświetl wszystko"
     hide_post: "Ukryj wpis?"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index 629099c86..a86ff931f 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -135,7 +135,7 @@ pt-BR:
       recent_notifications: "Notificações recentes"
       search: "Encontrar pessoas ou #tags"
       settings: "Configurações"
-      toggle_mobile: "Versão móvel"
+      switch_to_touch_optimized_mode: "Alternar para modo tátil"
       toggle_navigation: "Alternar navegação"
       view_all: "Ver todas"
     hide_post: "Esconder esta publicação?"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index bff0a1158..9bb91424f 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -114,7 +114,6 @@ pt-PT:
       recent_notifications: "Notificações recentes"
       search: "Procurar"
       settings: "Definições"
-      toggle_mobile: "Alternar móvel"
       toggle_navigation: "Alternar navegação"
       view_all: "Ver tudo"
     hide_post: "Ocultar esta publicação?"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 1d0bd0af9..0f18225ce 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -27,7 +27,7 @@ ru:
         no_info: "Нет дополнительной информации"
         not_available: "недоступно"
         offline_since: "недоступен с:"
-        pod: "Стручок"
+        pod: "Под"
         recheck:
           failure: "Проверка не выполнялась."
           success: "Под только что был перепроверен."
@@ -145,7 +145,7 @@ ru:
       recent_notifications: "Последние уведомления"
       search: "Поиск"
       settings: "Настройки"
-      toggle_mobile: "Обычный/мобильный"
+      switch_to_touch_optimized_mode: "Включить сенсорный режим"
       toggle_navigation: "Переключение навигации"
       view_all: "Посмотреть всё"
     hide_post: "Скрыть эту запись?"
diff --git a/config/locales/javascript/javascript.sc.yml b/config/locales/javascript/javascript.sc.yml
index bbc178ea2..c632fcf7e 100644
--- a/config/locales/javascript/javascript.sc.yml
+++ b/config/locales/javascript/javascript.sc.yml
@@ -133,7 +133,7 @@ sc:
       recent_notifications: "Notìficas reghentes"
       search: "Chirca"
       settings: "Impostatziones"
-      toggle_mobile: "Allughe/istuda sa versione mòbile"
+      switch_to_touch_optimized_mode: "Cola a sa modalidade tàtile otimizada"
       toggle_navigation: "Allughe/istuda su menù de nàvigu"
       view_all: "Ammustra totu"
     hide_post: "Istichire custa publicatzione?"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 37d6938ad..13b61a157 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -134,7 +134,6 @@ sv:
       recent_notifications: "Tidigare notiser"
       search: "Sök"
       settings: "Inställningar"
-      toggle_mobile: "Växla mobiltelefonanpassning"
       toggle_navigation: "Växla navigation"
       view_all: "Visa alla"
     hide_post: "Vill du dölja inlägget?"
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index f612a49db..cfe0b18fb 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -144,7 +144,7 @@ uk:
       recent_notifications: "Останнє повідомлення"
       search: "Пошук людей чи #міток"
       settings: "Налаштування"
-      toggle_mobile: "Звичайний/мобільний"
+      switch_to_touch_optimized_mode: "Перемкнутися на режим, оптимізований для дотиків"
       toggle_navigation: "Перемикання навігації"
       view_all: "Показати все"
     hide_post: "Приховати запис?"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 4d38b47d4..413ab5a8a 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -129,7 +129,6 @@ zh-TW:
       recent_notifications: "最新消息"
       search: "搜尋"
       settings: "設定"
-      toggle_mobile: "切換行動版頁面"
       toggle_navigation: "瀏覽模式切換"
       view_all: "看全部"
     hide_post: "要隱藏貼文嗎？"
diff --git a/db/migrate/20181227235201_clean_up_posts_indexes.rb b/db/migrate/20181227235201_clean_up_posts_indexes.rb
new file mode 100644
index 000000000..268282155
--- /dev/null
+++ b/db/migrate/20181227235201_clean_up_posts_indexes.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class CleanUpPostsIndexes < ActiveRecord::Migration[5.1]
+  def change
+    remove_index :posts, %i[id type created_at]
+    remove_index :posts, :tweet_id
+    add_index :posts, %i[created_at id]
+  end
+end
diff --git a/features/desktop/auto_follow_back.feature b/features/desktop/auto_follow_back.feature
new file mode 100644
index 000000000..1b7404805
--- /dev/null
+++ b/features/desktop/auto_follow_back.feature
@@ -0,0 +1,36 @@
+@javascript
+Feature: auto follow back a user
+
+  Background:
+    Given following users exist:
+      | username       | email             |
+      | Bob Jones      | bob@bob.bob       |
+      | Alice Smith    | alice@alice.alice |
+    And I sign in as "bob@bob.bob"
+    And I have an aspect called "My main aspect"
+    And I have an aspect called "Others" with auto follow back
+    And I sign out
+
+  Scenario: When a user with auto follow back enabled is shared with, he's sharing back
+    When I sign in as "alice@alice.alice"
+    And I am on "bob@bob.bob"'s page
+    And I add the person to my "Besties" aspect
+    And I sign out
+    And I sign in as "bob@bob.bob"
+    Then I should have 1 contact in "Others"
+    When I am on "alice@alice.alice"'s page
+    Then I should see "Others" within the contact aspect dropdown
+
+  Scenario: When a user with auto follow back enabled is shared with by a user he's ignoring, he's not sharing back
+    When I sign in as "bob@bob.bob"
+    And I am on "alice@alice.alice"'s page
+    And I click on the profile block button
+    And I sign out
+    When I sign in as "alice@alice.alice"
+    And I am on "bob@bob.bob"'s page
+    And I add the person to my "Besties" aspect
+    And I sign out
+    And I sign in as "bob@bob.bob"
+    Then I should have 0 contact in "Others"
+    When I am on "alice@alice.alice"'s page
+    Then I should see "Stop ignoring" within "#unblock_user_button"
diff --git a/features/step_definitions/aspects_steps.rb b/features/step_definitions/aspects_steps.rb
index 9add74766..b00ddf731 100644
--- a/features/step_definitions/aspects_steps.rb
+++ b/features/step_definitions/aspects_steps.rb
@@ -38,6 +38,26 @@ module AspectCukeHelpers
 end
 World(AspectCukeHelpers)
 
+Given /^I have an aspect called "([^\"]*)"$/ do |aspect_name|
+  @me.aspects.create!(name: aspect_name)
+  @me.reload
+end
+
+Given /^I have an aspect called "([^\"]*)" with auto follow back$/ do |aspect_name|
+  aspect = @me.aspects.create!(name: aspect_name)
+  @me.auto_follow_back = true
+  @me.auto_follow_back_aspect = aspect
+  @me.save
+  @me.reload
+end
+
+Given /^I have following aspect[s]?:$/ do |fields|
+  fields.raw.each do |field|
+    @me.aspects.create!(name: field[0])
+  end
+  @me.reload
+end
+
 When /^I click on "([^"]*)" aspect edit icon$/ do |aspect_name|
   within(".all-aspects") do
     li = find('li', text: aspect_name)
@@ -112,6 +132,10 @@ And /^I toggle the aspect "([^"]*)"$/ do |name|
   toggle_aspect(name)
 end
 
+Then /^I should see "([^"]*)" within the contact aspect dropdown$/ do |aspect_name|
+  expect(find(".dropdown-toggle .text")).to have_content aspect_name
+end
+
 Then /^I should see "([^"]*)" aspect selected$/ do |aspect_name|
   aspect = @me.aspects.where(:name => aspect_name).first
   within("#aspects_list") do
diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb
index e50102961..ee4e71b69 100644
--- a/features/step_definitions/user_steps.rb
+++ b/features/step_definitions/user_steps.rb
@@ -72,17 +72,6 @@ When /^I click on my name$/ do
   click_link("#{@me.first_name} #{@me.last_name}")
 end
 
-Given /^I have an aspect called "([^\"]*)"$/ do |aspect_name|
-  @me.aspects.create!(:name => aspect_name)
-  @me.reload
-end
-
-Given /^I have following aspect[s]?:$/ do |fields|
-  fields.raw.each do |field|
-    step %{I have an aspect called "#{field[0]}"}
-  end
-end
-
 When /^I have user with username "([^"]*)" in an aspect called "([^"]*)"$/ do |username, aspect|
   user = User.find_by_username(username)
   contact = @me.reload.contact_for(user.person)