diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 7bbaa8232..2e04b069e 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -165,6 +165,7 @@ ar:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index ee928b374..a13ed601a 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -107,9 +107,9 @@ bg:
       people_sharing_with_you: "Хора споделящи с вас"
       post_a_message: "публикуване на съобщение >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Можете да свържете следните услуги към Diaspora:"
+        heading: "Свързване към услуги"
+      tags_following: "Тагове, които следите"
       your_aspects: "Вашите аспекти"
     many: "%{count} аспекта"
     move_contact: 
@@ -165,6 +165,7 @@ bg:
       add_a_new_aspect: "Създаване на аспект"
       all_contacts: "Всички контакти"
       edit_aspect: "Редактиране на \"%{name}\""
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Моите контакти"
       no_contacts: "Няма контакти."
       only_sharing_with_me: "Само споделящите с мен"
@@ -198,7 +199,7 @@ bg:
       no_conversation_selected: "няма избран разговор"
       no_messages: "няма съобщения"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Отказвате се от промените?"
       send: "Изпращане"
       subject: "тема"
       to: "до"
@@ -241,7 +242,7 @@ bg:
       already_sent: "Вече сте свързани с тава лице."
       no_more: "Не разполагате с повече покани."
       own_address: "Не можете да пращате покана до собствения си адрес."
-      rejected: "The following email addresses had problems: "
+      rejected: "Възникна проблем със следната ел. поща: "
       sent: "Покани са изпратени до: "
     edit: 
       sign_up: "регистриране"
@@ -287,7 +288,7 @@ bg:
         one: "харесана %{count} път"
         other: "харесана %{count} пъти"
         zero: "не е харесана"
-  limited: "Limited"
+  limited: "Ограничено"
   more: "Още"
   next: "следваща"
   no_results: "Няма намерени резултати"
@@ -514,7 +515,7 @@ bg:
     update: 
       failed: "Профилът не бе обновен"
       updated: "Профилът е обновен"
-  public: "Public"
+  public: "Публично"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -524,7 +525,7 @@ bg:
       edit: "Edit %{name}"
       leave_blank: "(оставете празно ако не желаете да го променяте)"
       password_to_confirm: "(за да бъдат потвърдени промените е необходима текущата ви парола)"
-      unhappy: "Unhappy?"
+      unhappy: "Не сте доволни?"
       update: "Обновяване"
     new: 
       enter_email: "Въведете ел. поща"
@@ -577,7 +578,7 @@ bg:
       disconnect: "изключване"
       edit_services: "Редактиране на услуги"
       logged_in_as: "вписани сте като"
-      no_services: "You have not connected any services yet."
+      no_services: "Все още не сте свързали нито една услуга."
       really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?"
     inviter: 
       click_link_to_accept_invitation: "Кликнете върху връзката, за да приемете поканата"
@@ -634,10 +635,10 @@ bg:
     stream_element: 
       dislike: "Не ми харесва"
       like: "Харесва ми"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Споделена с: %{aspect_names}"
       unlike: "Не ми харесва"
       via: "чрез %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Публикацията е видима за всеки"
   status_messages: 
     create: 
       success: "Споменахте успешно: %{names}"
@@ -662,32 +663,32 @@ bg:
     show_more_comments: "Показване на още %{number} коментара"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Не започнахте да следите \"#%{name}\""
+      success: "Започнахте да следите \"#%{name}\""
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Следенето на \"#%{name}\" не е прекратено"
+      success: "Следенето на \"#%{name}\" е прекатено"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Следете #%{tag}"
+      following: "Следите #%{tag}"
       nobody_talking: "Никой не е говорил за %{tag}."
       people_tagged_with: "Хора маркирани с %{tag}"
       posts_tagged_with: "Публикации с марка #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Прекратяване следването на #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Свързване с Cubbi.es"
-      connecting_is_simple: "За свързване на акаунта ви в Diaspora е необходимо да попълните две полета в Cubbi.es."
+      connecting_is_simple: "За свързване на акаунта ви в Diaspora е необходимо да въведете вашият адрес в Diaspora (<b>%{diaspora_id}</b>) в <a href='%{href_link}'>страницата с настройки</a> на Cubbi.es и да натиснете \"Connect\"."
       daniels_account: "акаунтът на Daniel в Diaspora"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "В най-скоро време ще можете да свързвате ново приложение без необходимост от създаване на отделен, от този, който ползвате, акаунт в Diaspora."
       love_to_try: "Бихме се радвали ако пробвате!"
       making_the_connection: "Създаване на връзката"
       screenshot_explanation: "%{link1}.  Тази cubby страница е свързана с %{link2}."
       sign_up_today: "Регистрирайте се днес!"
       typical_userpage: "Типична потребителска страница от cubbi.es"
       via: "(чрез %{link})"
-      what_is_cubbies: "Cubbi.es е първото приложение за Diaspora.  Също така е и най-добият назчин за събиране на изображения online."
+      what_is_cubbies: "Cubbi.es е първото приложение за Diaspora. Също така е и най-добият начин за събиране на изображения online."
   undo: "Отмяна?"
   username: "Потребителско име"
   users: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 4e5bab659..0e5b37a8a 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -165,6 +165,7 @@ br:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index c98e11062..ca9bb18d6 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -165,6 +165,7 @@ cs:
       add_a_new_aspect: "Přidat nový aspekt"
       all_contacts: "Všechny kontakty"
       edit_aspect: "Upravit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Moje kontakty"
       no_contacts: "Žádné kontakty."
       only_sharing_with_me: "Pouze sdílení se mnou"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 49dd82bdd..fa49a8dd6 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -165,6 +165,7 @@ cy:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 8abca6feb..c10b78566 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -165,6 +165,7 @@ da:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index ad99f2208..7fb5f1cff 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -165,6 +165,7 @@ de:
       add_a_new_aspect: "Einen neuen Aspekt hinzufügen"
       all_contacts: "Alle Kontakte"
       edit_aspect: "Bearbeite %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Meine Kontakte"
       no_contacts: "Keine Kontakte."
       only_sharing_with_me: "Nur mit mir teilende"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f86977400..a90540c14 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -165,6 +165,7 @@ el:
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       all_contacts: "Όλες οι Επαφές"
       edit_aspect: "Επεξεργασία %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Οι Επαφές μου"
       no_contacts: "Καμία Επαφή"
       only_sharing_with_me: "Μοιράζονται μόνο με εμένα"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 31e1fc3c1..d4593e50e 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -165,6 +165,7 @@ en_shaw:
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "𐑥𐑲 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕."
       only_sharing_with_me: "𐑴𐑯𐑤𐑦 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑥𐑰"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index a76c98446..e764799b8 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -165,6 +165,7 @@ eo:
       add_a_new_aspect: "Aldoni novan aspekton"
       all_contacts: "Ĉiuj kontaktoj"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Miaj kontaktoj"
       no_contacts: "Neniuj kontaktoj."
       only_sharing_with_me: "Nur partoprenata al mi"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index d39499b98..7e77a2987 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -165,6 +165,7 @@ es-AR:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 6243bd297..e56d19aaa 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -107,9 +107,9 @@ es-CL:
       people_sharing_with_you: "Personas compartiendo contigo"
       post_a_message: "postea un mensaje >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Puedes enlazar los siguientes servicios a Diaspora:"
+        heading: "Servicios que puedes enlazar"
+      tags_following: "Tags"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -165,6 +165,7 @@ es-CL:
       add_a_new_aspect: "Agregar un nuevo aspecto"
       all_contacts: "Todos los Contactos"
       edit_aspect: "Editar %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Mis Contactos"
       no_contacts: "Sin Contactos."
       only_sharing_with_me: "Solo compartiendo conmigo"
@@ -198,7 +199,7 @@ es-CL:
       no_conversation_selected: "ninguna conversación seleccionada"
       no_messages: "Sin mensajes"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Descartar los cambios?"
       send: "Enviar"
       subject: "asunto"
       to: "para"
@@ -287,7 +288,7 @@ es-CL:
         one: "1 persona le gusta esto"
         other: "%{count} personas les gusta esto"
         zero: "a ninguna persona le gusta esto"
-  limited: "Limited"
+  limited: "Restringido"
   more: "Más"
   next: "Siguiente"
   no_results: "No se encontraron resultados"
@@ -514,7 +515,7 @@ es-CL:
     update: 
       failed: "Error al actualizar perfil"
       updated: "Perfil actualizado"
-  public: "Public"
+  public: "Publico"
   registrations: 
     closed: "Los registros están cerrados en este servidor de Diaspora."
     create: 
@@ -577,7 +578,7 @@ es-CL:
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "has entrado como"
-      no_services: "You have not connected any services yet."
+      no_services: "Aun no has enlazado ningún servicio."
       really_disconnect: "¿desconectar %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Haz click en este enlace para aceptar tu invitación"
@@ -634,10 +635,10 @@ es-CL:
     stream_element: 
       dislike: "No me gusta esto"
       like: "Me gusta esto"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Compartir con: %{aspect_names}"
       unlike: "No me gusta"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Este post es visible para cualquiera en la web"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -662,25 +663,25 @@ es-CL:
     show_more_comments: "Mostrar %{number} comentarios más"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Error al seguir a: #%{name}"
+      success: "Ahora sigues a: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Error al dejar de seguir a: #%{name}"
+      success: "Ya no sigues mas a: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Seguir a #%{tag}"
+      following: "Siguiendo a #%{tag}"
       nobody_talking: "Todavía nadie habla de %{tag}."
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Posts etiquetados con #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Dejar de seguir a #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Conectarse a Cubbi.es"
-      connecting_is_simple: "Conectar la cuenta de diáspora es tan simple como llenar dos campos en la página de tu cuenta de Cubbi.es."
+      connecting_is_simple: "Conectar la cuenta de diáspora es tan simple! Solo ingresa tu ID de Diaspora (<b>%{diaspora_id}</b>) de tu <a href='%{href_link}'>pagina de configuración</a> de cubbies y presiona conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Muy pronto, podrás conectarte a nuevas aplicaciones sin crear una cuenta separada de la de Diaspora."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}.  Este cubby en particular esta linkeado a %{link2}."
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index bdcd8134a..f7f8dcbeb 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -107,9 +107,9 @@ es:
       people_sharing_with_you: "Comparten contigo"
       post_a_message: "publica un mensaje >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Ahora puedes enlazar los siguientes servicios a Diaspora*:"
+        heading: "Servicios enlazados"
+      tags_following: "Etiquetas"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -165,6 +165,7 @@ es:
       add_a_new_aspect: "Añadir un nuevo aspecto"
       all_contacts: "Todos los Contactos"
       edit_aspect: "Editar %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Mis Contactos"
       no_contacts: "Sin contactos."
       only_sharing_with_me: "Solo compartiendo conmigo"
@@ -198,7 +199,7 @@ es:
       no_conversation_selected: "ninguna conversación seleccionada"
       no_messages: "Sin mensajes"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "¿Descartar los cambios?"
       send: "Enviar"
       subject: "asunto"
       to: "para"
@@ -287,7 +288,7 @@ es:
         one: "A 1 le gusta"
         other: "A %{count} les gusta"
         zero: "A nadie le gusta"
-  limited: "Limited"
+  limited: "Restringido"
   more: "Más"
   next: "Siguiente"
   no_results: "No hay resultados"
@@ -514,7 +515,7 @@ es:
     update: 
       failed: "Error actualizando el perfil"
       updated: "Perfil actualizado"
-  public: "Public"
+  public: "Público"
   registrations: 
     closed: "Los registros están cerrados en este servidor Diaspora*"
     create: 
@@ -577,7 +578,7 @@ es:
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "Conectar como"
-      no_services: "You have not connected any services yet."
+      no_services: "Aún no has enlazado ningún servicio."
       really_disconnect: "¿Desconectar %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Haz click aquí para aceptar tu invitación"
@@ -634,10 +635,10 @@ es:
     stream_element: 
       dislike: "No me gusta"
       like: "Me gusta"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Compartir con: %{aspect_names}"
       unlike: "No me gusta"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Este comentario lo podrá ver cualquiera por internet"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -662,25 +663,25 @@ es:
     show_more_comments: "Muestra %{number} comentarios más"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Error al intentar seguir a #%{name}"
+      success: "Ahora también sigues a #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Error al dejar de seguir a #%{name}"
+      success: "Ya no sigues más a #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Seguir a #%{tag}"
+      following: "Siguiendo a #%{tag}"
       nobody_talking: "Nadie esta hablando de %{tag} todavía."
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Publicaciones etiquetadas con #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "No seguir más a #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Conecta con Cubbi.es"
-      connecting_is_simple: "Conectar con tu cuenta de Diaspora es tan simple como completar dos campos en tu página de Cubbi.es."
+      connecting_is_simple: "Enlazar tu cuenta de Diaspora* es sencillo. Solo introduce tu identificador de Diaspora*(<b>%{diaspora_id}</b>) en tu cuenta de Cubbi.es <a href='%{href_link}'>settings page</a> y darle a conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a nuevas aplicaciones sin tener que crearte un nueva cuenta aparte de la de Diaspora*."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está enlazado a %{link2}."
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 9559a96d9..2dee3311c 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -165,6 +165,7 @@ eu:
       add_a_new_aspect: "Alderdi berria gehitu"
       all_contacts: "Adiskide Guztiak"
       edit_aspect: "Aldatu %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Nire Adiskideak"
       no_contacts: "Adiskiderik ez."
       only_sharing_with_me: "Bakarrik nirekin harremanetan"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index ffb2c9fd2..97ec7afd3 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -165,6 +165,7 @@ fi:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Muokkaa %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 2661274a0..dc80047f7 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -165,6 +165,7 @@ fr:
       add_a_new_aspect: "Ajouter un nouvel aspect"
       all_contacts: "Tous les contacts"
       edit_aspect: "Modifier %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Mes Contacts"
       no_contacts: "Pas de contacts."
       only_sharing_with_me: "Partage uniquement avec moi"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 621894fd1..e1373e600 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -165,6 +165,7 @@ ga:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index cf82ffb70..9a0afaf10 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -165,6 +165,7 @@ he:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 997aea7ba..1836441f9 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -165,6 +165,7 @@ hu:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 0daa9befd..555e3e1bd 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -165,6 +165,7 @@ id:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index e8e295322..3174e8672 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -165,6 +165,7 @@ is:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 6b4e616ac..611979636 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -107,9 +107,9 @@ it:
       people_sharing_with_you: "Persone in condivisione con te"
       post_a_message: "invia un messaggio >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "Puoi abbinare a Diaspora i seguenti servizi:"
+        heading: "Servizi connessi"
+      tags_following: "Tag che stai seguendo"
       your_aspects: "I tuoi aspetti"
     many: "%{count} aspetti"
     move_contact: 
@@ -165,6 +165,7 @@ it:
       add_a_new_aspect: "Aggiungi un nuovo aspetto"
       all_contacts: "Tutti i contatti"
       edit_aspect: "Modifica %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "I miei contatti"
       no_contacts: "Nessun contatto."
       only_sharing_with_me: "Condividono con me"
@@ -198,7 +199,7 @@ it:
       no_conversation_selected: "nessuna conversazione selezionata"
       no_messages: "nessun messaggio"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "Annulla i cambiamenti?"
       send: "Invia"
       subject: "oggetto"
       to: "a"
@@ -210,7 +211,7 @@ it:
       birthday: "%d %B"
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
-  delete: "Cancella"
+  delete: "Elimina"
   email: "Email"
   error_messages: 
     helper: 
@@ -287,7 +288,7 @@ it:
         one: "%{count} Mi piace"
         other: "%{count} Mi piace"
         zero: "0 Mi piace"
-  limited: "Limited"
+  limited: "Non pubblico"
   more: "Altro"
   next: "successivo"
   no_results: "Nessun Risultato Trovato"
@@ -514,7 +515,7 @@ it:
     update: 
       failed: "Aggiornamento del profilo non riuscito"
       updated: "Profilo aggiornato"
-  public: "Public"
+  public: "Pubblico"
   registrations: 
     closed: "Le iscrizioni sono chiuse su questo pod Diaspora."
     create: 
@@ -577,7 +578,7 @@ it:
       disconnect: "disconnetti"
       edit_services: "Modifica servizi"
       logged_in_as: "accesso effettuato come"
-      no_services: "You have not connected any services yet."
+      no_services: "Ancora non hai abbinato alcun servizio."
       really_disconnect: "disconnettere %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Fai click su questo link per accettare l'invito"
@@ -634,10 +635,10 @@ it:
     stream_element: 
       dislike: "Non mi piace"
       like: "Mi piace"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "Condiviso con: %{aspect_names}"
       unlike: "Annulla"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Questo post è visibile a tutti sul web"
   status_messages: 
     create: 
       success: "Menzionati con successo: %{names}"
@@ -662,25 +663,25 @@ it:
     show_more_comments: "Mostra gli altri %{number} commenti"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "Errore nel tentativo di seguire: #%{name}"
+      success: "Hai iniziato a seguire: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "Non è stato possibile smettere di seguire: #%{name}"
+      success: "Hai smesso di seguire: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "Segui #%{tag}"
+      following: "Stai seguendo #%{tag}"
       nobody_talking: "Nessuno sta ancora parlando di %{tag}."
       people_tagged_with: "Persone etichettate come %{tag}"
       posts_tagged_with: "Post etichettati come #%{tag}"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "Smetti di seguire #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connettiti a Cubbi.es"
       connecting_is_simple: "Per connettere il tuo account Diaspora basta riempire due campi di testo nelle tue impostazioni su Cubbi.es."
       daniels_account: "account Diaspora di Daniel"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Presto potrai connetterti ad una nuova applicazione senza dover creare un account separato da quello che hai già su Diaspora."
       love_to_try: "Ci farebbe piacere che tu lo provassi."
       making_the_connection: "Effettua la connessione"
       screenshot_explanation: "%{link1}.  Questa pagina di cubby è collegata all' %{link2}."
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 25f2f6f31..76e6679ac 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -165,6 +165,7 @@ ja:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 6037d5fe1..d4c654467 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -107,9 +107,9 @@ ko:
       people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
       services: 
-        content: "You can connect the following services to Diaspora:"
-        heading: "Connect Services"
-      tags_following: "Followed Tags"
+        content: "다음의 여러 서비스를 디아스포라에 연결할 수 있습니다"
+        heading: "서비스 연결"
+      tags_following: "팔로우된 태그들"
       your_aspects: "내 애스펙"
     many: "애스펙 %{count}개"
     move_contact: 
@@ -165,6 +165,7 @@ ko:
       add_a_new_aspect: "새 애스펙 추가"
       all_contacts: "모든 컨택"
       edit_aspect: "%{name} 고치기"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "내 컨택"
       no_contacts: "컨택 없음."
       only_sharing_with_me: "나와만 공유하고 있는 사람들"
@@ -198,7 +199,7 @@ ko:
       no_conversation_selected: "대화를 고르지 않았습니다"
       no_messages: "쪽지 없음"
     new: 
-      abandon_changes: "Abandon changes?"
+      abandon_changes: "변경을 포기할까요?"
       send: "보내기"
       subject: "제목"
       to: "받는이"
@@ -514,7 +515,7 @@ ko:
     update: 
       failed: "프로필 갱신 실패"
       updated: "프로필을 갱신했습니다"
-  public: "Public"
+  public: "공개"
   registrations: 
     closed: "우리 디아스포라 팓은 가입이 닫혀있습니다."
     create: 
@@ -577,7 +578,7 @@ ko:
       disconnect: "끊기"
       edit_services: "서비스 설정"
       logged_in_as: "로그인 중: "
-      no_services: "You have not connected any services yet."
+      no_services: "아직 연결한 서비스가 없습니다."
       really_disconnect: "%{service} 서비스를 끊으시겠습니까?"
     inviter: 
       click_link_to_accept_invitation: "초대를 수락려면 클릭하세요!"
@@ -634,10 +635,10 @@ ko:
     stream_element: 
       dislike: "싪어요"
       like: "좋아요"
-      shared_with: "Shared with: %{aspect_names}"
+      shared_with: "공유된 애스펙: %{aspect_names}"
       unlike: "좋아요 취소"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "이 공유물은 웹의 누구든지 볼 수 있습니다"
   status_messages: 
     create: 
       success: "%{names}님을 성공적으로 멘션했습니다."
@@ -662,25 +663,25 @@ ko:
     show_more_comments: "댓글 %{number}개 더 보기"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
-      success: "Successfully following: #%{name}"
+      failure: "팔로우를 실패하였습니다: #%{name}"
+      success: "성공적으로 팔로우하였습니다: #%{name}"
     destroy: 
-      failure: "Failed to stop following: #%{name}"
-      success: "Successfully stopped following: #%{name}"
+      failure: "팔로우 멈추기를 실패하였습니다: #%{name}"
+      success: "성공적으로 팔로우를 멈췄습니다: #%{name}"
   tags: 
     show: 
-      follow: "Follow #%{tag}"
-      following: "Following #%{tag}"
+      follow: "#%{tag} 태그 팔로우하기"
+      following: "#%{tag} 태그 팔로우중"
       nobody_talking: "아직 %{tag} 태그가 달린 공유물이 없습니다."
       people_tagged_with: "%{tag} 태그가 달린 사람들"
       posts_tagged_with: "#%{tag} 태그가 달린 공유물"
-      stop_following: "Stop Following #%{tag}"
+      stop_following: "#%{tag} 태그 팔로우 멈추기"
   tokens: 
     show: 
       connect_to_cubbies: "Cubbi.es에 연결하기"
       connecting_is_simple: "내 Cubbi.es에 있는 account 메뉴의 두 항목을 채워넣기만 하면 내 다이스포라 계정을 연결할 수 있습니다."
       daniels_account: "Daniel님의 디아스포라 계정"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "곧 디아스포라 계정이 아닌 별도의 계정을 만들지 않고도 새 애플리케이션에 연결할 수 있게됩니다."
       love_to_try: "꼭 써보세요!"
       making_the_connection: "연결하기"
       screenshot_explanation: "%{link1}. 이 cubby는 %{link2}에 연결되어 있습니다."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index f30c307b9..e3df3b752 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -165,6 +165,7 @@ lt:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 5cce128fa..4f792e105 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -165,6 +165,7 @@ mk:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 39796023e..6649cd986 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -165,6 +165,7 @@ nb:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 9351d1808..65983b9b5 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -110,7 +110,7 @@ nl:
         content: "Je kunt de volgende service met Diaspora verbinden:"
         heading: "Verbind Services"
       tags_following: "Gevolgde Tags"
-      your_aspects: "Jou aspecten"
+      your_aspects: "Jouw Aspecten"
     many: "%{count} aspecten"
     move_contact: 
       error: "Probleem bij het verplaatsen van contact: %{inspect}"
@@ -165,6 +165,7 @@ nl:
       add_a_new_aspect: "Voeg een aspect toe"
       all_contacts: "Alle Contacten"
       edit_aspect: "Bewerk %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "Mijn Contacten"
       no_contacts: "Geen contacten."
       only_sharing_with_me: "Delen alleen met mij"
@@ -678,9 +679,9 @@ nl:
   tokens: 
     show: 
       connect_to_cubbies: "Verbind met Cubbi.es"
-      connecting_is_simple: "Voor het koppelen van je Diaspora account vul je slechts twee velden in op je Cubbi.es account pagina."
+      connecting_is_simple: "Je Diaspora account verbinden is simpel! Vul je Diaspora ID (<b>%{diaspora_id}</b>) in op cubbies <a href='%{href_link}'>settings page</a> en klik op connect."
       daniels_account: "Daniel's Diaspora account"
-      log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
+      log_in_with_diaspora_is_comming: "Binnenkort is het mogelijk om met een nieuwe applicatie te verbinden zonder eerst een apart account aan te hoeven maken."
       love_to_try: "We zouden het erg leuk vinden als je het uitprobeert."
       making_the_connection: "Verbindend"
       screenshot_explanation: "%{link1}.  Deze cubby is gelinkt aan %{link2}."
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 35e7ec03d..f9b83860f 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -165,6 +165,7 @@ pa:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 177442a5e..4ef7b3f4d 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -165,6 +165,7 @@ pl:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 714bc8600..3d42e19fd 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -165,6 +165,7 @@ pt-BR:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 7774d4449..141b11ea7 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -165,6 +165,7 @@ pt-PT:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 502471ef3..93c88e65b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -165,6 +165,7 @@ ro:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index c990657f7..9d393693e 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -4,7 +4,7 @@
 
 
 ru: 
-  _applications: "Applications"
+  _applications: "Приложения"
   _comments: "Коментарии"
   _contacts: "Contacts"
   _home: "Домашний"
@@ -162,16 +162,17 @@ ru:
       failure: "Не удалось создать контакт"
     few: "%{count} контакт[-а, -ов]"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
+      add_a_new_aspect: "Добавить аспект"
+      all_contacts: "Все контакты"
       edit_aspect: "Edit %{name}"
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
+      my_contacts: "Мои контакты"
+      no_contacts: "Контактов нет."
       only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      remove_person_from_aspect: "Удалить %{person_name} из \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
+      title: "Контакты"
+      your_contacts: "Ваши контакты"
     many: "%{count} контакт[-а, -ов]"
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
@@ -588,7 +589,7 @@ ru:
   settings: "Настройки"
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
+      add_new_contact: "Добавить контакт"
       create_request: "Поиск по Диаспоре"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Введите имя пользователя Диаспоры:"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 8652832f0..cc814aeac 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -165,6 +165,7 @@ sk:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 621d15726..b48170b15 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -165,6 +165,7 @@ sl:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index baee4013a..d12a964ca 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -165,6 +165,7 @@ sv:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index c5ad5a81a..6a7aeb0ac 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -165,6 +165,7 @@ tr:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index c047e861e..cee0e6e0f 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -165,6 +165,7 @@ zh-CN:
       add_a_new_aspect: "Add a new aspect"
       all_contacts: "All Contacts"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 41eb8c8ca..7a46492f2 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -165,6 +165,7 @@ zh-TW:
       add_a_new_aspect: "加入新面向"
       all_contacts: "全部聯絡人"
       edit_aspect: "Edit %{name}"
+      many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
       my_contacts: "我的聯絡人"
       no_contacts: "沒有聯絡人."
       only_sharing_with_me: "Only sharing with me"