Merge branch 'release/0.7.9.0'

Changelog.md

+# 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

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"

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)

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";
         }
       }

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 {

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;

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>

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
 

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?
 

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

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

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

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

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?

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

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

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

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/"

config/locales/diaspora/ar.yml

@@ -217,7 +217,6 @@ ar:
       powered_by: "بدعم DIASPORA*"
       public_feed: "ملقم دياسبرا العام لـ %{name}"
       source_package: "نزّل حزمة الشِّفرة المصدريّة"
-      toggle: "حَوِّل لموقع الهواتف المحمولة"
       whats_new: "ما الجديد؟"
     header:
       code: "شيفرة"

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: "код"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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: "Κώδικας"

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"

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"

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"

config/locales/diaspora/en_shaw.yml

@@ -125,7 +125,6 @@ en_shaw:
     application:
       powered_by: "𐑐𐑬𐑮𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
       public_feed: "𐑐𐑳𐑚𐑤𐑦𐑒 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑰𐑛 𐑓𐑹 %{name}"
-      toggle: "𐑑𐑪𐑜𐑩𐑤 𐑥𐑴𐑚𐑩𐑤 𐑕𐑲𐑑"
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
     header:
       code: "𐑒𐑴𐑛"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

config/locales/diaspora/he.yml

@@ -286,7 +286,6 @@ he:
       powered_by: "מופעל על ידי דיאספורה*"
       public_feed: "פרסומים ציבוריים בדיאספורה* מאת %{name}"
       source_package: "הורדת חבילת קוד המקור"