diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 2f77258173f7c9aa6100763d5dbe1054aa7194d2..7bbaa8232ed07fc01781841b1f9d8b3ce5f9409c 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -106,6 +106,10 @@ ar:
       no_contacts: "لا أعضاء"
       people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} فئات"
     move_contact: 
@@ -194,6 +198,7 @@ ar:
       no_conversation_selected: "لم تحدد أية محادثة"
       no_messages: "لا يوجد رسائل"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "إرسال"
       subject: "العنوان"
       to: "إلى"
@@ -267,6 +272,7 @@ ar:
       logout: "خروج"
       profile: "الصفحة الشخصية"
       settings: "إعدادات"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ar:
         one: "1 أعجبه هذا"
         other: "%{count} أشخاص أعجبهم هذا"
         zero: "لا أحد أحب هذا"
+  limited: "Limited"
   more: "أكثر"
   next: "التالي"
   no_results: "لا نتائج موجودة"
@@ -507,6 +514,7 @@ ar:
     update: 
       failed: "فشل في تحديث حسابك الشخصي"
       updated: "تم تحديث حسابك الشخصي"
+  public: "Public"
   registrations: 
     closed: "التسجيلات مغلقة على هذه المنصة"
     create: 
@@ -569,6 +577,7 @@ ar:
       disconnect: "فصل الإتصال"
       edit_services: "تعديل الخدمات"
       logged_in_as: "متصل بحساب"
+      no_services: "You have not connected any services yet."
       really_disconnect: "فصل إتصال %{service}?"
     inviter: 
       click_link_to_accept_invitation: "إضغط على هذا الرابط لقبول دعوتك"
@@ -625,8 +634,10 @@ ar:
     stream_element: 
       dislike: "لم يعجبني"
       like: "أعجبني"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "إلغاء إعجابي"
       via: "بواسطة %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "ذكرت بنجاح: %{names}"
@@ -649,28 +660,34 @@ ar:
   stream_helper: 
     hide_comments: "إخفاء التعليقات"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "لا أحد يتكلم %{tag} بعد"
       people_tagged_with: "أشخاص tagged بـ %{tag}"
       posts_tagged_with: "رسائل tagged بـ #%{tag}"
-  the_world: "العالم"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "اتصل بـ Cubbi.es"
       connecting_is_simple: "صِل حساب دياسبرا خاصتك عن طريق ملأ حقلين بـصفحة حساب Cubbi.es خاصتك."
       daniels_account: "حساب دياسبرا الخاص بدانييل"
-      generate_a_token: "أنشئ إقليدا"
+      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."
       love_to_try: "نحبذ أن تجربه."
       making_the_connection: "جارِ الإتصال"
       screenshot_explanation: "%{link1}.  هذا الـ cubby خاص بـ %{link2}."
       sign_up_today: "سجل الآن!"
       typical_userpage: "حساب cubbi.es نموذجي"
       via: "(بواسطة %{link})"
-      were_working_hard: "نحن نعمل بكد لخلق اتصال سلس وسهل بين منصات دياسبرا مع برمجيات أخرى.  على سبيل المثال, وصل حساب دياسبرا بـ Cubbi.es يعني نسخ ولصق حقلين فقط"
       what_is_cubbies: "Cubbi.es هو أول برنامج خاص بدياسبرا في العالم.  وأيضا أفضل وسيلة لتجميع الصور على الويب."
-      your_diaspora_handle: "وسيط دياسبرا خاصتك:"
-      your_diaspora_token: "إقليد دياسبرا خاصتك:"
   undo: "تراجع؟"
   username: "معرف"
   users: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 5a40fc4fd2a20a99759046bdf5281f91052c50ea..ee928b3745cab3d4b8c08f1481ca8d3b6a163b2e 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -106,6 +106,10 @@ bg:
       no_contacts: "Няма контакти"
       people_sharing_with_you: "Хора споделящи с вас"
       post_a_message: "публикуване на съобщение >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Вашите аспекти"
     many: "%{count} аспекта"
     move_contact: 
@@ -135,7 +139,7 @@ bg:
     zero: "няма аспекти"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "Прекратяване на достъпа"
   back: "Назад"
   bookmarklet: 
     explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
@@ -194,6 +198,7 @@ bg:
       no_conversation_selected: "няма избран разговор"
       no_messages: "няма съобщения"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Изпращане"
       subject: "тема"
       to: "до"
@@ -267,6 +272,7 @@ bg:
       logout: "отписване"
       profile: "профил"
       settings: "настройки"
+      view_all: "Показване на всички"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ bg:
         one: "харесана %{count} път"
         other: "харесана %{count} пъти"
         zero: "не е харесана"
+  limited: "Limited"
   more: "Още"
   next: "следваща"
   no_results: "Няма намерени резултати"
@@ -507,6 +514,7 @@ bg:
     update: 
       failed: "Профилът не бе обновен"
       updated: "Профилът е обновен"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -567,8 +575,9 @@ bg:
       connect_to_tumblr: "Свързване с tumblr"
       connect_to_twitter: "Свързване с twitter"
       disconnect: "изключване"
-      edit_services: "Редактиране на услугите"
+      edit_services: "Редактиране на услуги"
       logged_in_as: "вписани сте като"
+      no_services: "You have not connected any services yet."
       really_disconnect: "Наистина ли желаете свързаността с %{service} да бъде изключена?"
     inviter: 
       click_link_to_accept_invitation: "Кликнете върху връзката, за да приемете поканата"
@@ -610,7 +619,7 @@ bg:
       all: "всички"
       all_contacts: "всички контакти"
       click_to_share_with: "Кликнете, за да споделите: "
-      discard_post: "Discard post"
+      discard_post: "Отхвърляне на публикацията"
       make_public: "направете публично"
       post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
       posting: "Публикуване..."
@@ -625,8 +634,10 @@ bg:
     stream_element: 
       dislike: "Не ми харесва"
       like: "Харесва ми"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Не ми харесва"
       via: "чрез %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Споменахте успешно: %{names}"
@@ -649,28 +660,34 @@ bg:
   stream_helper: 
     hide_comments: "Скриване на коментарите"
     show_more_comments: "Показване на още %{number} коментара"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Никой не е говорил за %{tag}."
       people_tagged_with: "Хора маркирани с %{tag}"
       posts_tagged_with: "Публикации с марка #%{tag}"
-  the_world: "светът"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Свързване с Cubbi.es"
       connecting_is_simple: "За свързване на акаунта ви в Diaspora е необходимо да попълните две полета в Cubbi.es."
       daniels_account: "акаунтът на Daniel в Diaspora"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "Бихме се радвали ако пробвате!"
       making_the_connection: "Създаване на връзката"
       screenshot_explanation: "%{link1}.  Тази cubby страница е свързана с %{link2}."
       sign_up_today: "Регистрирайте се днес!"
       typical_userpage: "Типична потребителска страница от cubbi.es"
       via: "(чрез %{link})"
-      were_working_hard: "Работим усилено за създаването на лесен начин за свързване на Diaspora pods и приложения.  Междувременно свързването на акаунта ви в Diaspora с Cubbi.es става само с копиране и поставяне на две полета."
       what_is_cubbies: "Cubbi.es е първото приложение за Diaspora.  Също така е и най-добият назчин за събиране на изображения online."
-      your_diaspora_handle: "Вашият адрес в Diaspora:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Отмяна?"
   username: "Потребителско име"
   users: 
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 05e684625c3aec85761f198d0de7d5d6e1ed62c5..4e5bab65924226c4ccd34d28c32060fd0bfc54b3 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -106,6 +106,10 @@ br:
       no_contacts: "Darempred ebet"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} arvez"
     move_contact: 
@@ -194,6 +198,7 @@ br:
       no_conversation_selected: "no conversation selected"
       no_messages: "kemennadenn ebet"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Kaset"
       subject: "sujed"
       to: "da"
@@ -267,6 +272,7 @@ br:
       logout: "mont kuit"
       profile: "patrom"
       settings: "dibaboù"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ br:
         one: "1 den zo bet plijet ganti"
         other: "%{count} den zo bet plijet ganti"
         zero: "den ebet zo bet plijet ganti"
+  limited: "Limited"
   more: "Muioc'h"
   next: "next"
   no_results: "Disoc'h Ebet"
@@ -507,6 +514,7 @@ br:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ br:
       disconnect: "disconnect"
       edit_services: "Edit services"
       logged_in_as: "logged in as"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ br:
     stream_element: 
       dislike: "Ne blij ket din"
       like: "Plij' ra din"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ br:
   stream_helper: 
     hide_comments: "kuzhaat an embannoù"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Den ebet zo o kaozeal diwar-benn %{tag} c'hoazh."
       people_tagged_with: "Tud bet merket gant %{tag}"
       posts_tagged_with: "Skridoù bet merket gant #%{tag}"
-  the_world: "ar bed"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Mont war-gil?"
   username: "Anv-implijer"
   users: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 6b8ba8626f38b8b6dab0186bbcff0733da736396..c98e110625b004fe0ba302dcb358035e493f8e77 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -6,7 +6,7 @@
 cs: 
   _applications: "Aplikace"
   _comments: "Komentáře"
-  _contacts: "Contacts"
+  _contacts: "Kontakty"
   _home: "Doma"
   _photos: "fotky"
   _services: "Služby"
@@ -63,11 +63,11 @@ cs:
     aspect_contacts: 
       done_editing: "ukončit úpravy"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Přidat aspekt"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
+      commented_on: "komentoval"
+      posted: "publikováno"
+      recently: "v poslední době:"
       stream: "Stream"
     contacts_not_visible: "Kontakty v tomto aspektu se nebudou schopni vidět mezi sebou."
     contacts_visible: "Kontakty v tomto aspektu se budou moci vidět mezi sebou."
@@ -99,14 +99,18 @@ cs:
         heading: "Připojit se na Cubbi.es"
         learn_more: "Dozvědět se více"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
+        content_1: "Vaše Diaspora ID je:"
+        content_2: "Dejte to někomu a bude vás moci najít na Diaspoře."
         heading: "Diaspora ID"
-      handle_explanation: "Toto je váš Diaspora identifikátor. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
+      handle_explanation: "Toto je vaše Diaspora ID. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
       no_contacts: "Žádné kontakty"
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
       post_a_message: "odeslat příspěvek >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      your_aspects: "Vaše aspekty"
     many: "%{count} aspektů"
     move_contact: 
       error: "Chyba při přesunu kontaktu: %{inspect}"
@@ -116,17 +120,17 @@ cs:
       create: "Vytvořit"
       name: "Název"
     no_posts_message: 
-      start_talking: "Zatím žádný příspěvek. Začněte konverzaci!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Nikdo zatím ještě nic nesdělil!"
+      try_adding_some_more_contacts: "Zkuste přidat další kontakty."
     one: "1 aspekt"
     other: "%{count} aspektů"
     seed: 
       family: "Rodina"
       work: "Práce"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Spravovat vaše aspekty."
+      no_contacts: "Nemáte zde dosud žádné kontakty."
+      view_all_contacts: "Zobrazit všechny kontakty"
     show: 
       edit_aspect: "upravit aspekt"
     update: 
@@ -140,7 +144,7 @@ cs:
   bookmarklet: 
     explanation: "Příspěvek na Diasporu odkudkoliv pomocí %{link}."
     explanation_link_text: "tohoto odkazu"
-    heading: "Diaspora Bookmarklet"
+    heading: "Bookmarklet"
     post_something: "Poslat něco na Diasporu"
     post_success: "Odesláno! Zavírám!"
   cancel: "Zrušit"
@@ -160,12 +164,12 @@ cs:
     index: 
       add_a_new_aspect: "Přidat nový aspekt"
       all_contacts: "VÅ¡echny kontakty"
-      edit_aspect: "Edit %{name}"
+      edit_aspect: "Upravit %{name}"
       my_contacts: "Moje kontakty"
       no_contacts: "Žádné kontakty."
       only_sharing_with_me: "Pouze sdílení se mnou"
       remove_person_from_aspect: "Odstranit %{person_name} z \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Zahájit konverzaci"
       title: "Kontakty"
       your_contacts: "Vaše kontakty"
     many: "%{count} kontaktů"
@@ -185,7 +189,7 @@ cs:
         many: "%{count} nových zpráv"
         one: "1 nová zpráva"
         other: "%{count} nových zpráv"
-        zero: "žádné nové zprávy"
+        zero: "Žádné nové zprávy"
     index: 
       create_a_new_message: "vytvořit novou zprávu"
       inbox: "Doručená pošta"
@@ -194,6 +198,7 @@ cs:
       no_conversation_selected: "není výbrána žádná konverzace"
       no_messages: "žádné zprávy"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Poslat"
       subject: "předmět"
       to: "pro"
@@ -212,7 +217,7 @@ cs:
       correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
       invalid_fields: "Neplatná pole"
   fill_me_out: "Vyplňte"
-  find_people: "Find people"
+  find_people: "Najít lidi"
   hide: "Skrýt"
   home: 
     show: 
@@ -267,6 +272,7 @@ cs:
       logout: "odhlásit"
       profile: "profil"
       settings: "nastavení"
+      view_all: "Zobrazit všechno"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ cs:
         one: "1 osobě se to líbí"
         other: "%{count} lidem se to líbí"
         zero: "žádná kladná hodnocení"
+  limited: "Limited"
   more: "Více"
   next: "další"
   no_results: "Nebyly nalezeny žádné výsledky"
@@ -309,7 +316,7 @@ cs:
         many: "%{count} nových oznámení"
         one: "1 nové oznámení"
         other: "%{count} nových oznámení"
-        zero: "žádná nová oznámení"
+        zero: "Žádná nová oznámení"
     index: 
       and: "a"
       and_others: 
@@ -507,6 +514,7 @@ cs:
     update: 
       failed: "Nepodařilo se aktualizovat profil"
       updated: "Profil aktualizován"
+  public: "Public"
   registrations: 
     closed: "Zápisy jsou aktuálně uzavřeny na tomto Diasporu podu."
     create: 
@@ -569,6 +577,7 @@ cs:
       disconnect: "odpojit"
       edit_services: "Upravit služby"
       logged_in_as: "přihlášen jako"
+      no_services: "You have not connected any services yet."
       really_disconnect: "odpojit %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klikněte na tento odkaz, pokud chcete přijmout pozvání"
@@ -580,8 +589,8 @@ cs:
   shared: 
     add_contact: 
       add_new_contact: "Přidat nový kontakt"
-      create_request: "Hledat podle Diaspora identifikátoru"
-      diaspora_handle: "diaspora@handle.org"
+      create_request: "Hledat podle Diaspora ID"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Zadejte uživatelské jméno na Diaspoře:"
       know_email: "Znáte jejich emailové adresy? Můžete je pozvat"
       your_diaspora_username_is: "Vaše uživatelské jméno na Diaspoře: %{diaspora_handle}"
@@ -610,7 +619,7 @@ cs:
       all: "všechny"
       all_contacts: "všechny kontakty"
       click_to_share_with: "Klikněte pro sdílení s:"
-      discard_post: "Discard post"
+      discard_post: "Zahodit příspěvek"
       make_public: "vytvořit veřejnou"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
@@ -618,15 +627,17 @@ cs:
       publishing_to: "publikování na:"
       share: "Sdělit"
       share_with: "sdílet s"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "co máte na mysli?"
+      upload_photos: "Nahrát fotografie"
+      whats_on_your_mind: "Co máte na mysli?"
     reshare: 
       reshare: "Sdílet jinam"
     stream_element: 
       dislike: "to se mi nelíbí"
       like: "to se mi líbí"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "to se mi už nelíbí"
       via: "skrz %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Úspěšně zmíněno: %{names}"
@@ -647,30 +658,36 @@ cs:
       other: "vaše stavové zprávy musí mít méně než %{count} znaků"
       zero: "vaše stavové zprávy musí mít méně než %{count} znaků"
   stream_helper: 
-    hide_comments: "skrýt komentáře"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "Skrýt všechny komentáře"
+    show_more_comments: "Zobrazit %{number} dalších komentářů"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nikdo dosud nemluví o %{tag}."
       people_tagged_with: "Lidé označeni %{tag}"
       posts_tagged_with: "Příspěvky označené #%{tag}"
-  the_world: "svět"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Připojit na Cubbi.es"
       connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché, jak vyplňovat dvě pole na vaší stránce účtu Cubbi.es."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Vytvořit token"
+      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."
       love_to_try: "Rádi bychom, aby jste to vyzkoušeli."
       making_the_connection: "Vytvoření spojení"
       screenshot_explanation: "%{link1}. Tato konkrétní cubby je připojena na %{link2}."
       sign_up_today: "Registrujte se ještě dnes!"
       typical_userpage: "Typická uživatelská stránka na cubbi.es"
       via: "(přes %{link})"
-      were_working_hard: "Usilovně pracujeme na dosažení snadného spojení mezi pody Diaspory a aplikacemi. Do té doby, spojení vašeho účtu na Diaspoře s Cubbi.es znamená kopírování a vkládání dvou polí."
       what_is_cubbies: "Cubbi.es je celosvětově první aplikace Diaspory. Je to také nejlepší způsob, jak shromáždit fotografie online."
-      your_diaspora_handle: "Vaše indentifikace na Diaspoře:"
-      your_diaspora_token: "Váš token na Diaspoře:"
   undo: "Vrátit?"
   username: "Uživatelské jméno"
   users: 
@@ -694,7 +711,7 @@ cs:
       receive_email_notifications: "Přijímat oznámení emailem když..."
       started_sharing: "...někdo začne sdílet s vámi?"
       your_email: "Váš email"
-      your_handle: "Vaše identifikace na Diaspoře"
+      your_handle: "Vaše Diaspora ID"
     getting_started: 
       connect_on_diaspora: "Připojit na Diaspoře"
       connect_services: "Připojit vaše další služby"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index ee0974e20ebd0bb7626a456c420f95c7e80bbef7..49dd82bddecf26c74e294c20dcc2c14393acba98 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -106,6 +106,10 @@ cy:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ cy:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ cy:
       logout: "logout"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ cy:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "next"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ cy:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ cy:
       disconnect: "disconnect"
       edit_services: "Edit services"
       logged_in_as: "logged in as"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ cy:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ cy:
   stream_helper: 
     hide_comments: "hide comments"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "the world"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Username"
   users: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 28bf146b087cb87d4cad31db18e859a53b27635c..8abca6feb8d72c84460cbb66eeafb5b73c334ee8 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -106,6 +106,10 @@ da:
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "Personer der deler med dig"
       post_a_message: "post en besked >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspekter"
     move_contact: 
@@ -194,6 +198,7 @@ da:
       no_conversation_selected: "ingen samtale valgt"
       no_messages: "ingen beskeder"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "emne"
       to: "til"
@@ -267,6 +272,7 @@ da:
       logout: "Log ud"
       profile: "profil"
       settings: "indstillinger"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ da:
         one: "1 person kunne lide det"
         other: "%{count} personer kunne lide det"
         zero: "ingen personer kunne lide det"
+  limited: "Limited"
   more: "Mere"
   next: "Næste"
   no_results: "Ingen resultater fundet"
@@ -507,6 +514,7 @@ da:
     update: 
       failed: "Kunne ikke opdatere profil"
       updated: "Profil opdateret"
+  public: "Public"
   registrations: 
     closed: "Der er lukket for tilmeldinger på dette Diaspora server."
     create: 
@@ -569,6 +577,7 @@ da:
       disconnect: "afbryd"
       edit_services: "Redigér tjenester"
       logged_in_as: "log ind som"
+      no_services: "You have not connected any services yet."
       really_disconnect: "afbryd %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klik på dette link for at acceptere din invitation"
@@ -625,8 +634,10 @@ da:
     stream_element: 
       dislike: "Jeg kan ikke lide det"
       like: "Jeg kan lide det"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Synes ikke godt om"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "%{names} nævnet med succes"
@@ -649,28 +660,34 @@ da:
   stream_helper: 
     hide_comments: "Skjul kommentarer"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Ingen har talt om %{tag} endnu."
       people_tagged_with: "Personer tagged med %{tag}"
       posts_tagged_with: "Poster tagged med #%{tag}"
-  the_world: "Verden"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Fortryd?"
   username: "Brugernavn"
   users: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 8b9bc1dab55f7cb6fabe834d773276f7406f4261..ad99f2208da858a9ace17156d6ee5251b307df9e 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -106,6 +106,10 @@ de:
       no_contacts: "Keine Kontakte"
       people_sharing_with_you: "Leute die mit dir teilen"
       post_a_message: "schreibe eine Nachricht >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Deine Aspekte"
     many: "%{count} Aspekte"
     move_contact: 
@@ -194,6 +198,7 @@ de:
       no_conversation_selected: "Keine Konversation ausgewählt"
       no_messages: "Keine Nachrichten"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Senden"
       subject: "Betreff"
       to: "An"
@@ -267,6 +272,7 @@ de:
       logout: "Abmelden"
       profile: "Profil"
       settings: "Einstellungen"
+      view_all: "alle anzeigen"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ de:
         one: "1 Person gefällt das"
         other: "%{count} Personen gefällt das"
         zero: "Keinem gefällt das"
+  limited: "Limited"
   more: "Mehr"
   next: "Nächste"
   no_results: "Du musst nach etwas suchen."
@@ -309,7 +316,7 @@ de:
         many: "%{count} neue Benachrichtigungen"
         one: "Eine neue Benachrichtigung"
         other: "%{count} neue Benachrichtigungen"
-        zero: "keine neuen Benachrichtigungen"
+        zero: "Keine neuen Benachrichtigungen"
     index: 
       and: "und"
       and_others: 
@@ -507,6 +514,7 @@ de:
     update: 
       failed: "Fehler beim aktualisieren deines Profils"
       updated: "Profil aktualisiert"
+  public: "Public"
   registrations: 
     closed: "Registrierungen sind auf diesem Pod geschlossen."
     create: 
@@ -569,6 +577,7 @@ de:
       disconnect: "Verbindung entfernen"
       edit_services: "Dienste bearbeiten"
       logged_in_as: "angemeldet als"
+      no_services: "You have not connected any services yet."
       really_disconnect: "Verbindung mit %{service} entfernen?"
     inviter: 
       click_link_to_accept_invitation: "Öffne diesen Link um die Einladung zu akzeptieren"
@@ -625,8 +634,10 @@ de:
     stream_element: 
       dislike: "Gefällt mir nicht"
       like: "Gefällt mir"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Gefällt mir nicht mehr"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Erfolgreich erwähnt: %{names}"
@@ -649,28 +660,34 @@ de:
   stream_helper: 
     hide_comments: "Kommentare verbergen"
     show_more_comments: "Zeige %{number} weitere Kommentare"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Niemand hat bereits etwas über %{tag} gesagt."
       people_tagged_with: "Personen die mit %{tag} getagt sind"
       posts_tagged_with: "Beiträge die mit #%{tag} getagt sind"
-  the_world: "Die Welt"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Mit Cubbi.es verbinden"
       connecting_is_simple: "Um dein Diaspora Konto zu verbinden, kopiere einfach die zwei Felder in deine Cubbi.es Kontoseite."
       daniels_account: "Daniels Diaspora-Konto"
-      generate_a_token: "Token generieren"
+      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."
       love_to_try: "Es wäre toll wenn Du es ausprobieren würdest."
       making_the_connection: "Die Verbindung herstellen"
       screenshot_explanation: "%{link1}.  Dieses \"Cubby\" ist verlinkt auf %{link2}."
       sign_up_today: "Jetzt registrieren!"
       typical_userpage: "Eine typische cubbi.es Benutzerseite"
       via: "(via %{link})"
-      were_working_hard: "Wir arbeiten hart daran eine einfache Verbindung zwischen Diaspora Pods und Anwendungen zu ermöglichen. In der Zwischenzeit musst Du zwei Felder kopieren und wieder einfügen um dein Diaspora Konto mit Cubbi.es zu verbinden."
       what_is_cubbies: "Cubbi.es ist die erste Diaspora Anwendung der Welt. Es ist auch der beste Weg um Online Fotos zu sammeln."
-      your_diaspora_handle: "Deine Diaspora ID:"
-      your_diaspora_token: "Dein Diaspora-Token:"
   undo: "Rückgängig machen?"
   username: "Benutzername"
   users: 
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f9152dc6d3a25df0c6fb3a81baa39a97ba8b620e..f869774001f2639d527e096f3d4bd37cdd1a840e 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -4,9 +4,9 @@
 
 
 el: 
-  _applications: "Applications"
+  _applications: "Εφαρμογές"
   _comments: "Σχόλια"
-  _contacts: "Contacts"
+  _contacts: "Επαφές"
   _home: "Αρχική"
   _photos: "Φωτογραφίες"
   _services: "Υπηρεσίες"
@@ -63,11 +63,11 @@ el:
     aspect_contacts: 
       done_editing: "ολοκλήρωση επεξεργασίας"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Προσθέστε μια πτυχή"
     aspect_stream: 
       commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
+      posted: "δημοσιεύτηκε"
+      recently: "πρόσφατα:"
       stream: "Stream"
     contacts_not_visible: "Οι επαφές σ' αυτήν την πτυχή δεν θα μπορούν να δουν ο ένας τον άλλον."
     contacts_visible: "Οι επαφές σ' αυτήν την πτυχή θα μπορούν να δουν ο ένας τον άλλον."
@@ -99,14 +99,18 @@ el:
         heading: "Συνδεθείτε στο Cubbi.es"
         learn_more: "Μάθετε περισσότερα"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora. Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να μπορέσουν να σας βρουν."
+        content_1: "Το Diaspora αναγνωριστικό σας (ID) είναι:"
+        content_2: "Δώστε το σε κάποιον και θα μπορεί να σας βρει στο Diaspora."
+        heading: "Αναγνωριστικό Diaspora (ID)"
+      handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora (ID). Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να σας βρουν."
       no_contacts: "Καμία επαφή"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
       post_a_message: "δημοσιεύστε ένα μήνυμα >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      your_aspects: "Οι Πτυχές σας"
     many: "%{count} πτυχές"
     move_contact: 
       error: "Σφάλμα μεταφοράς επαφής: %{inspect}"
@@ -116,17 +120,17 @@ el:
       create: "Δημιουργία"
       name: "Όνομα"
     no_posts_message: 
-      start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα. Ξεκινήστε εσείς τη συζήτηση!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα!"
+      try_adding_some_more_contacts: "Προσπαθείστε να προσθέσετε περισσότερες επαφές."
     one: "1 πτυχή"
     other: "%{count} πτυχές"
     seed: 
       family: "Οικογένεια"
       work: "Εργασία"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Διαχείριση των πτυχών."
+      no_contacts: "Δεν έχετε ακόμα κάποια επαφή εδώ."
+      view_all_contacts: "Προβολή όλων των επαφών"
     show: 
       edit_aspect: "επεξεργασία πτυχής"
     update: 
@@ -135,12 +139,12 @@ el:
     zero: "καμία πτυχή"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "Ανάκληση Πρόσβασης"
   back: "Πίσω"
   bookmarklet: 
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας %{link}."
     explanation_link_text: "αυτόν τον σύνδεσμο"
-    heading: "Diaspora Bookmarklet"
+    heading: "Bookmarklet"
     post_something: "Δημοσιεύστε κάτι στο Diaspora"
     post_success: "Δημοσιεύτηκε! Κλείνει!"
   cancel: "Ακύρωση"
@@ -158,16 +162,16 @@ el:
       failure: "Αποτυχία δημιουργίας επαφής"
     few: "%{count} επαφές"
     index: 
-      add_a_new_aspect: "Add a new aspect"
-      all_contacts: "All Contacts"
-      edit_aspect: "Edit %{name}"
-      my_contacts: "My Contacts"
-      no_contacts: "No contacts."
-      only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
+      add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
+      all_contacts: "Όλες οι Επαφές"
+      edit_aspect: "Επεξεργασία %{name}"
+      my_contacts: "Οι Επαφές μου"
+      no_contacts: "Καμία Επαφή"
+      only_sharing_with_me: "Μοιράζονται μόνο με εμένα"
+      remove_person_from_aspect: "Μετακίνηση του χρήστη %{person_name} από την πτυχή \"%{aspect_name}\""
+      start_a_conversation: "Ξεκινήστε μια συζήτηση"
+      title: "Επαφές"
+      your_contacts: "Οι Επαφές σας"
     many: "%{count} επαφές"
     one: "1 επαφή"
     other: "%{count} επαφές"
@@ -185,7 +189,7 @@ el:
         many: "%{count} νέα μηνύματα"
         one: "1 νέο μήνυμα"
         other: "%{count} νέα μηνύματα"
-        zero: "κανένα νέο μήνυμα"
+        zero: "Κανένα νέο μήνυμα"
     index: 
       create_a_new_message: "δημιουργία νέου μηνύματος"
       inbox: "Εισερχόμενα"
@@ -194,6 +198,7 @@ el:
       no_conversation_selected: "δεν επιλέχτηκε συζήτηση"
       no_messages: "κανένα μήνυμα"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Αποστολή"
       subject: "θέμα"
       to: "στον"
@@ -212,7 +217,7 @@ el:
       correct_the_following_errors_and_try_again: "Διορθώστε τα ακόλουθα σφάλματα και προσπαθήστε ξανά."
       invalid_fields: "Άκυρα Πεδία"
   fill_me_out: "Ενημέρωσε με"
-  find_people: "Find people"
+  find_people: "Βρείτε άτομα"
   hide: "Απόκρυψη"
   home: 
     show: 
@@ -267,6 +272,7 @@ el:
       logout: "αποσύνδεση"
       profile: "προφίλ"
       settings: "ρυθμίσεις"
+      view_all: "Προβολή όλων"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ el:
         one: "Αρέσει σε 1 άτομο"
         other: "Αρέσει σε %{count} άτομα"
         zero: "δεν αρέσει σε κανέναν"
+  limited: "Limited"
   more: "Περισσότερα"
   next: "επόμενο"
   no_results: "Δεν βρέθηκαν αποτελέσματα"
@@ -309,7 +316,7 @@ el:
         many: "%{count} νέες ειδοποιήσεις"
         one: "1 νέα ειδοποίηση"
         other: "%{count} νέες ειδοποιήσεις"
-        zero: "καμία νέα ειδοποίηση"
+        zero: "Kαμία νέα ειδοποίηση"
     index: 
       and: "και"
       and_others: 
@@ -502,11 +509,12 @@ el:
       your_photo: "Η φωτογραφία σας"
       your_private_profile: "Το ιδιωτικό σας προφίλ"
       your_public_profile: "Το δημόσιο προφίλ σας"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_tags: "Περιγράψτε τον εαυτό σας με 5 λέξεις"
+      your_tags_placeholder: "όπως #movies #kittens #travel #teacher #newyork"
     update: 
       failed: "Αποτυχία ενημέρωσης προφίλ"
       updated: "Το προφίλ ενημερώθηκε"
+  public: "Public"
   registrations: 
     closed: "Οι εγγραφές είναι κλειστές σε αυτό το pod του Diaspora."
     create: 
@@ -569,6 +577,7 @@ el:
       disconnect: "αποσύνδεση"
       edit_services: "Επεξεργασία υπηρεσιών"
       logged_in_as: "συνδεδεμένο ως"
+      no_services: "You have not connected any services yet."
       really_disconnect: "αποσύνδεση %{service};"
     inviter: 
       click_link_to_accept_invitation: "Κάντε κλικ σ' αυτό το σύνδεσμο για να αποδεχθείτε την πρόσκλησή σας"
@@ -579,9 +588,9 @@ el:
   settings: "Ρυθμίσεις"
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
-      create_request: "Εύρεση βάσει αναγνωριστικού Diaspora"
-      diaspora_handle: "Αναγνωριστικό Diaspora"
+      add_new_contact: "Προσθέστε μια νέα επαφή"
+      create_request: "Εύρεση βάσει Diaspora ID"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Εισάγετε όνομα χρήστη Diaspora:"
       know_email: "Ξέρετε τις ηλεκτρονικές τους διευθύνσεις; Τότε πρέπει να τους προσκαλέσετε"
       your_diaspora_username_is: "Το όνομα χρήστη σας στο Diaspora είναι: %{diaspora_handle}"
@@ -610,7 +619,7 @@ el:
       all: "όλα"
       all_contacts: "όλες οι επαφές"
       click_to_share_with: "Πατήστε για να διαμοιραστείτε με: "
-      discard_post: "Discard post"
+      discard_post: "Απομάκρυνση δημοσίευσης"
       make_public: "Δημοσιοποίησε το"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
@@ -618,15 +627,17 @@ el:
       publishing_to: "δημοσίευση στο: "
       share: "Μοιράσου"
       share_with: "Μοιράσου με"
-      upload_photos: "Upload photos"
+      upload_photos: "Μεταφόρτωση εικόνων"
       whats_on_your_mind: "Τι σκέφτεστε;"
     reshare: 
       reshare: "Μοιράσου και πάλι"
     stream_element: 
       dislike: "Δεν μ' αρέσει"
       like: "Μου αρέσει"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Δεν μου αρέσει"
       via: "μέσω %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Αναφέρθηκαν επιτυχώς: %{names}"
@@ -647,30 +658,36 @@ el:
       other: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
       zero: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
   stream_helper: 
-    hide_comments: "απόκρυψη σχολίων"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "Απόκρυψη όλων των σχολίων"
+    show_more_comments: "Προβολή %{number} ακόμα σχολίων"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Κανένας δεν μιλάει ακόμα για την ετικέτα %{tag}."
       people_tagged_with: "Άτομα με την ετικέτα %{tag}"
       posts_tagged_with: "Δημοσιεύσεις με την ετικέτα #%{tag}"
-  the_world: "ο κόσμος"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
       connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας γίνεται απλά με τη συμπλήρωση των δύο πεδίων στην σελίδα σύνδεσης του Cubbi.es."
       daniels_account: "Diaspora λογαριασμό του Daniel"
-      generate_a_token: "Δημιουργήστε ένα token"
+      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."
       love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
       making_the_connection: "Σύνδεση"
       screenshot_explanation: "%{link1}.  Αυτό το συγκεκριμένο cubby συνδέεται στον %{link2}."
       sign_up_today: "Συνδεθείτε σήμερα!"
       typical_userpage: "Μία τυπική cubbi.es σελίδα χρήστη"
       via: "(μέσω %{link})"
-      were_working_hard: "Δουλεύουμε σκληρά για να παρέχουμε τη μέγιστη συνδεσιμότητα του Diaspora με άλλες εφαρμογές. Προς το παρόν, η σύνδεση του Diaspora λογαριασμού σας με το Cubbi.es γίνεται με την αντιγραφή και την επικόλληση δύο πεδίων."
       what_is_cubbies: "Το Cubbi.es είναι παγκοσμίως η πρώτη εφαρμογή για το Diaspora. Είναι επίσης ο καλύτερος τρόπος συλλογής φωτογραφιών στο διαδίκτυο."
-      your_diaspora_handle: "Το Diaspora Αναγνωριστικό σας:"
-      your_diaspora_token: "Το Diaspora Token σας:"
   undo: "Αναίρεση;"
   username: "Όνομα Χρήστη"
   users: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 8cac59ac724c2b53bebd0e15f06c72b8de9f53e5..31e1fc3c1d069f2ba21af0665dcda61cbe94cc11 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -106,6 +106,10 @@ en_shaw:
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     move_contact: 
@@ -194,6 +198,7 @@ en_shaw:
       no_conversation_selected: "𐑯𐑴 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑩𐑤𐑧𐑒𐑑𐑩𐑛"
       no_messages: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡𐑩𐑟"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "𐑕𐑧𐑯𐑛"
       subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑"
       to: "𐑑"
@@ -267,6 +272,7 @@ en_shaw:
       logout: "𐑤𐑪𐑜 𐑬𐑑"
       profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
       settings: "𐑕𐑧𐑑𐑦𐑙𐑟"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ en_shaw:
         one: "%{count} 𐑤𐑲𐑒"
         other: "%{count} 𐑤𐑲𐑒𐑕"
         zero: "𐑯𐑴 𐑤𐑲𐑒𐑕"
+  limited: "Limited"
   more: "𐑥𐑹"
   next: "𐑯𐑧𐑒𐑕𐑑"
   no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛"
@@ -507,6 +514,7 @@ en_shaw:
     update: 
       failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       updated: "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑𐑩𐑛"
+  public: "Public"
   registrations: 
     closed: "𐑕𐑲𐑯𐑩𐑐𐑕 𐑸 𐑒𐑤𐑴𐑟𐑛 𐑪𐑯 𐑞𐑦𐑕 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛."
     create: 
@@ -569,6 +577,7 @@ en_shaw:
       disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑"
       edit_services: "𐑧𐑛𐑦𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
       logged_in_as: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑨𐑟"
+      no_services: "You have not connected any services yet."
       really_disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 %{service}?"
     inviter: 
       click_link_to_accept_invitation: "𐑒𐑤𐑦𐑒 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑿𐑼 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
@@ -625,8 +634,10 @@ en_shaw:
     stream_element: 
       dislike: "𐑛𐑦𐑕𐑤𐑲𐑒"
       like: "𐑤𐑲𐑒"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "𐑩𐑯𐑤𐑲𐑒"
       via: "𐑝𐑾 %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
@@ -649,28 +660,34 @@ en_shaw:
   stream_helper: 
     hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑦𐑟 𐑑𐑷𐑒𐑦𐑙 𐑩𐑚𐑬𐑑 %{tag} 𐑘𐑧𐑑."
       people_tagged_with: "𐑐𐑰𐑐𐑩𐑤 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 %{tag}"
       posts_tagged_with: "𐑐𐑴𐑕𐑑𐑕 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 #%{tag}"
-  the_world: "𐑞 𐑢𐑻𐑤𐑛"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
       connecting_is_simple: "𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑦𐑟 𐑨𐑟 𐑕𐑦𐑥𐑐𐑩𐑤 𐑨𐑟 𐑓𐑦𐑤𐑦𐑙 𐑬𐑑 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟 𐑪𐑯 𐑿𐑼 Cubbi.es 𐑩𐑒𐑬𐑯𐑑 𐑐𐑱𐑡."
       daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑"
-      generate_a_token: "𐑡𐑧𐑯𐑼𐑱𐑑 𐑩 𐑑𐑴𐑒𐑩𐑯"
+      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."
       love_to_try: "𐑢𐑰'𐑛 𐑤𐑳𐑝 𐑓𐑹 𐑿 𐑑 𐑑𐑮𐑲 𐑦𐑑 𐑬𐑑."
       making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯"
       screenshot_explanation: "%{link1}.  𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}."
       sign_up_today: "𐑕𐑲𐑯 𐑳𐑐 𐑑𐑩𐑛𐑱!"
       typical_userpage: "𐑩 𐑑𐑦𐑐𐑦𐑒𐑩𐑤 cubbi.es 𐑿𐑟𐑼𐑐𐑱𐑡"
       via: "(𐑝𐑾 %{link})"
-      were_working_hard: "𐑢𐑺 𐑢𐑻𐑒𐑦𐑙 𐑣𐑸𐑛 𐑪𐑯 𐑛𐑦𐑤𐑦𐑝𐑼𐑦𐑙 𐑰𐑟𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑝𐑦𐑑𐑦 𐑚𐑦𐑑𐑢𐑰𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛𐑟 𐑯 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯𐑟.  𐑦𐑯 𐑞 𐑥𐑰𐑯𐑑𐑲𐑥, 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑢𐑦𐑞 Cubbi.es 𐑥𐑰𐑯𐑟 𐑒𐑪𐑐𐑦𐑦𐑙 𐑯 𐑐𐑱𐑕𐑑𐑦𐑙 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟."
       what_is_cubbies: "Cubbi.es 𐑦𐑟 𐑞 𐑢𐑻𐑤𐑛𐑟 𐑓𐑻𐑕𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯.  𐑦𐑑𐑕 𐑷𐑤𐑕𐑴 𐑞 𐑚𐑧𐑕𐑑 𐑢𐑱 𐑑 𐑒𐑩𐑤𐑧𐑒𐑑 𐑓𐑴𐑑𐑴𐑟 𐑪𐑯𐑤𐑲𐑯."
-      your_diaspora_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤:"
-      your_diaspora_token: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑑𐑴𐑒𐑩𐑯:"
   undo: "𐑩𐑯𐑛𐑵?"
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 8bc454e1e6b43490157c2b1bed7488b58f93818c..a76c98446a0809eb2fa923970eead569bf03497a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -106,6 +106,10 @@ eo:
       no_contacts: "Nul kontaktoj"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
       post_a_message: "Afiŝi mesaĝon »"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspektoj"
     move_contact: 
@@ -194,6 +198,7 @@ eo:
       no_conversation_selected: "ne interparolado estas elektita"
       no_messages: "neniuj mesaĝoj"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Sendi"
       subject: "subjekto"
       to: "al"
@@ -267,6 +272,7 @@ eo:
       logout: "elsaluti"
       profile: "profilo"
       settings: "agordoj"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ eo:
         one: "%{count} ŝato"
         other: "%{count} ŝatoj"
         zero: "nul ŝatoj"
+  limited: "Limited"
   more: "Pli"
   next: "poste"
   no_results: "Neniuj Resultoj Trovitaj"
@@ -507,6 +514,7 @@ eo:
     update: 
       failed: "Ne povis ĝisdatigi profilon"
       updated: "Äœisdatigi profilon"
+  public: "Public"
   registrations: 
     closed: "Registrado estas ferma ĉe tiu ĉi DIASPORA* guŝo."
     create: 
@@ -569,6 +577,7 @@ eo:
       disconnect: "malkonekti"
       edit_services: "Redakti servojn"
       logged_in_as: "ensalutis, kiel"
+      no_services: "You have not connected any services yet."
       really_disconnect: "ĉu malkonektu el %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kliki tiun ligilon por akcepti vian inviton"
@@ -625,8 +634,10 @@ eo:
     stream_element: 
       dislike: "Malŝati"
       like: "ŝati"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Ne plu ŝati"
       via: "de %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Sukcese mencigis: %{names}"
@@ -649,28 +660,34 @@ eo:
   stream_helper: 
     hide_comments: "kaŝi komentojn"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Neniu jam parolas pri %{tag}."
       people_tagged_with: "Homoj etikediĝis kun %{tag}"
       posts_tagged_with: "Afiŝoj etikediĝis kun #%{tag}"
-  the_world: "la tuta mondo"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Konekti al Cubbi.es"
       connecting_is_simple: "Konekti vian DIASPORA* konton estas tiel facila, kiel kompleti du kampojn ĉe via Cubbi.es kontpaĝo."
       daniels_account: "La DIASPORA* konto de Daniel"
-      generate_a_token: "Generi ĵetonon"
+      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."
       love_to_try: "Ni vin amus, se vi provi ĝin."
       making_the_connection: "Konektanta"
       screenshot_explanation: "%{link1}.  Tiu aparta cubby ligas kun %{link2}."
       sign_up_today: "Registiĝi hodiaŭ!"
       typical_userpage: "Tipa cubbi.es uzantpaĝo"
       via: "(de %{link})"
-      were_working_hard: "Ni laboregas liveri facilan konektecon inter DIASPORA guŝoj kaj aplikaĵoj.  Dumtempe, por konektigi vian DIASPORA* konton kun Cubbi.es, vi devas kopii kaj algui du kampojn."
       what_is_cubbies: "Cubbi.es estas la unua DIASPORA* aplikaĵo en la tuta mondo.  Ĝi estas la plej bona maniero por rete kunigi bildojn."
-      your_diaspora_handle: "Via DIASPORA* Uzantnomo:"
-      your_diaspora_token: "Via DIASPORA* Ä´etono:"
   undo: "Ĉu malfarigi?"
   username: "Uzantnomo"
   users: 
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 5d7bd2a5aa2dae0318b1ad300e903c70a7ed0b17..d39499b98db17f6c2221385d870c6d586a808f33 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -106,6 +106,10 @@ es-AR:
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Comparten con vos"
       post_a_message: "publicar un mensaje >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspectos"
     move_contact: 
@@ -194,6 +198,7 @@ es-AR:
       no_conversation_selected: "ninguna conversación seleccionada"
       no_messages: "no hay mensajes"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Enviar"
       subject: "asunto"
       to: "para"
@@ -267,6 +272,7 @@ es-AR:
       logout: "desconectarse"
       profile: "perfil"
       settings: "configuración"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ es-AR:
         one: "%{count} le gusta"
         other: "%{count} les gusta"
         zero: "a nadie le gusta"
+  limited: "Limited"
   more: "Más"
   next: "siguiente"
   no_results: "No hay resultados"
@@ -507,6 +514,7 @@ es-AR:
     update: 
       failed: "No pudo actualizarse el perfil"
       updated: "Perfil actualizado"
+  public: "Public"
   registrations: 
     closed: "Los registros están cerrados en este servidor de Diáspora*."
     create: 
@@ -569,6 +577,7 @@ es-AR:
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "conectado como"
+      no_services: "You have not connected any services yet."
       really_disconnect: "¿Querés desconectarte de %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Cliqueá en este enlace para aceptar la invitación"
@@ -625,8 +634,10 @@ es-AR:
     stream_element: 
       dislike: "Me disgusta"
       like: "Me gusta"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "No me gusta"
       via: "vía %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Se mencionó a: %{names}"
@@ -649,28 +660,34 @@ es-AR:
   stream_helper: 
     hide_comments: "ocultar los comentarios"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nadie está hablado sobre %{tag} todavía."
       people_tagged_with: "Personas etiquetadas con %{tag}"
       posts_tagged_with: "Publicaciones etiquetadas con #%{tag}"
-  the_world: "el mundo"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Conectar a Cubbi.es"
       connecting_is_simple: "Conectar tu cuenta Diáspora* es tan simple como completar dos campos en la página de tu cuenta de Cubbi.es."
       daniels_account: "Cuenta de Daniel en Diáspora*"
-      generate_a_token: "Generar un token"
+      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."
       love_to_try: "Nos encantaría que la pruebes."
       making_the_connection: "Haciendo la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está enlazado a %{link2}."
       sign_up_today: "¡Registrate ahora mismo!"
       typical_userpage: "Una típica página de usuario de cubbi.es"
       via: "(vía %{link})"
-      were_working_hard: "Estamos trabajando arduamente para facilitar la conectividad entre los servidores Diáspora* y las aplicaiones. Mientras tanto, conectar tu cuenta Diáspora* con Cubbi.es significa copiar y pegar dos campos."
       what_is_cubbies: "Cubbi.es es la primera aplicación de Diáspora*. Es, también, la mejor forma de coleccionar fotos en línea."
-      your_diaspora_handle: "Tu dirección Diáspora*:"
-      your_diaspora_token: "Tu 'token' Diáspora*:"
   undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 602df25e2ab30a4f781b9f3ceb459e3bb68b5ea5..6243bd297d55d7382a826052d925cdafb3296f71 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -6,7 +6,7 @@
 es-CL: 
   _applications: "Aplicaciones"
   _comments: "Comentarios"
-  _contacts: "Contacts"
+  _contacts: "Contactos"
   _home: "Inicio"
   _photos: "fotos"
   _services: "Servicios"
@@ -63,12 +63,12 @@ es-CL:
     aspect_contacts: 
       done_editing: "Aceptar"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Añadir un aspecto"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "comentó"
+      posted: "posteado"
+      recently: "recientemente:"
+      stream: "Novedades"
     contacts_not_visible: "Los contactos en este Aspecto no se podrán ver entre ellos."
     contacts_visible: "Los contactos en este Aspecto se podrán ver entre ellos."
     create: 
@@ -99,14 +99,18 @@ es-CL:
         heading: "Conectate a Cubbi.es"
         learn_more: "Aprende mas"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
+        content_1: "Tu ID de Diaspora es:"
+        content_2: "Daselo a quien quieras y podrán encontrarte en Diaspora."
+        heading: "ID de Diaspora "
+      handle_explanation: "Este es tu ID de Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Personas compartiendo contigo"
       post_a_message: "postea un mensaje >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
       error: "Error al mover el contacto: %{inspect}"
@@ -116,17 +120,17 @@ es-CL:
       create: "Crear"
       name: "Nombre"
     no_posts_message: 
-      start_talking: "Nadie ha dicho nada aún.  ¡Que comiense la conversación!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Nadie ha dicho nada aún!"
+      try_adding_some_more_contacts: "Prueba agregando algunos contactos más."
     one: "1 aspecto"
     other: "%{count} aspectos"
     seed: 
       family: "Familia"
       work: "Trabajo"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Organiza tus aspectos."
+      no_contacts: "Todavía no tienes ningún contacto aquí."
+      view_all_contacts: "Ver todos los contactos"
     show: 
       edit_aspect: "editar aspecto"
     update: 
@@ -160,12 +164,12 @@ es-CL:
     index: 
       add_a_new_aspect: "Agregar un nuevo aspecto"
       all_contacts: "Todos los Contactos"
-      edit_aspect: "Edit %{name}"
+      edit_aspect: "Editar %{name}"
       my_contacts: "Mis Contactos"
       no_contacts: "Sin Contactos."
       only_sharing_with_me: "Solo compartiendo conmigo"
       remove_person_from_aspect: "Eliminar a %{person_name} de \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Comenzar una conversación"
       title: "Contactos"
       your_contacts: "Tus Contactos"
     many: "%{count} contactos"
@@ -194,6 +198,7 @@ es-CL:
       no_conversation_selected: "ninguna conversación seleccionada"
       no_messages: "Sin mensajes"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Enviar"
       subject: "asunto"
       to: "para"
@@ -212,7 +217,7 @@ es-CL:
       correct_the_following_errors_and_try_again: "Corrige los siguientes errores e inténtalo de nuevo."
       invalid_fields: "Campos Inválidos"
   fill_me_out: "Complétame"
-  find_people: "Find people"
+  find_people: "Buscar personas"
   hide: "Ocultar"
   home: 
     show: 
@@ -267,6 +272,7 @@ es-CL:
       logout: "salir"
       profile: "perfil"
       settings: "Configuración"
+      view_all: "Ver todo"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ es-CL:
         one: "1 persona le gusta esto"
         other: "%{count} personas les gusta esto"
         zero: "a ninguna persona le gusta esto"
+  limited: "Limited"
   more: "Más"
   next: "Siguiente"
   no_results: "No se encontraron resultados"
@@ -507,6 +514,7 @@ es-CL:
     update: 
       failed: "Error al actualizar perfil"
       updated: "Perfil actualizado"
+  public: "Public"
   registrations: 
     closed: "Los registros están cerrados en este servidor de Diaspora."
     create: 
@@ -569,6 +577,7 @@ es-CL:
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "has entrado como"
+      no_services: "You have not connected any services yet."
       really_disconnect: "¿desconectar %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Haz click en este enlace para aceptar tu invitación"
@@ -580,8 +589,8 @@ es-CL:
   shared: 
     add_contact: 
       add_new_contact: "Agregar un nuevo contacto"
-      create_request: "Encontrar por la dirección Diaspora"
-      diaspora_handle: "diaspora@handle.org"
+      create_request: "Encontrar por el ID de Diaspora"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Ingresa tu nombre de usuario Diaspora:"
       know_email: "¿Conoces sus direcciones de correo? Deberías invitarlos"
       your_diaspora_username_is: "Tu nombre de usuario Diaspora es: %{diaspora_handle}"
@@ -610,7 +619,7 @@ es-CL:
       all: "todo"
       all_contacts: "todos los contactos"
       click_to_share_with: "Click para compartir con: "
-      discard_post: "Discard post"
+      discard_post: "Descartar post"
       make_public: "hacer público"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
@@ -618,15 +627,17 @@ es-CL:
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con "
-      upload_photos: "Upload photos"
+      upload_photos: "Subir fotos"
       whats_on_your_mind: "¿Que pasa por tu cabeza?"
     reshare: 
       reshare: "Compartir de nuevo"
     stream_element: 
       dislike: "No me gusta esto"
       like: "Me gusta esto"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "No me gusta"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -647,30 +658,36 @@ es-CL:
       other: "Tu mensaje de estado debe tener menos de %{count} caracteres"
       zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
   stream_helper: 
-    hide_comments: "ocultar comentarios"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "ocultar todos los comentarios"
+    show_more_comments: "Mostrar %{number} comentarios más"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Todavía nadie habla de %{tag}."
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Posts etiquetados con #%{tag}"
-  the_world: "el mundo"
+      stop_following: "Stop Following #%{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."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      generate_a_token: "Generar un token"
+      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."
       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}."
       sign_up_today: "Registrate hoy mismo!"
       typical_userpage: "Una tipica pagina de usuario de cubbi.es "
       via: "(via %{link})"
-      were_working_hard: "Estamos trabajando duro en ofrecer una conectividad sencilla entre los pods de Diaspora y las aplicaciones. Mientras tanto, la conexión de su cuenta de diáspora con Cubbi.es significa copiar y pegar dos campos."
       what_is_cubbies: "Cubbi.es es la primera aplicación en el mundo de Diaspora.  Es también la mejor manera de coleccionar fotos online."
-      your_diaspora_handle: "Tu cuenta en Diaspora:"
-      your_diaspora_token: "Tu token Diaspora:"
   undo: "Deshacer?"
   username: "Nombre de usuario"
   users: 
@@ -694,7 +711,7 @@ es-CL:
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
       started_sharing: "...alguien comienza a compartir contigo?"
       your_email: "Tu correo electrónico"
-      your_handle: "Tu dirección diaspora"
+      your_handle: "Tu id de diaspora"
     getting_started: 
       connect_on_diaspora: "Conectar en Diaspora"
       connect_services: "Conectar tus otros servicios"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index c5c05ede6ae29e58eed9f99d0781152dcd05c3d8..bdcd8134a6d2735d380e8dd03d2dc05cc809f0ff 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -65,7 +65,7 @@ es:
     aspect_listings: 
       add_an_aspect: "+ Añadir un aspecto"
     aspect_stream: 
-      commented_on: "comentados recientemente"
+      commented_on: "comentarios recientes"
       posted: "fecha de publicación"
       recently: "ordenar por:"
       stream: "Novedades"
@@ -106,6 +106,10 @@ es:
       no_contacts: "No hay contactos"
       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"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -194,6 +198,7 @@ es:
       no_conversation_selected: "ninguna conversación seleccionada"
       no_messages: "Sin mensajes"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Enviar"
       subject: "asunto"
       to: "para"
@@ -267,6 +272,7 @@ es:
       logout: "salir"
       profile: "perfil"
       settings: "configuración"
+      view_all: "Ver todo"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ es:
         one: "A 1 le gusta"
         other: "A %{count} les gusta"
         zero: "A nadie le gusta"
+  limited: "Limited"
   more: "Más"
   next: "Siguiente"
   no_results: "No hay resultados"
@@ -405,7 +412,7 @@ es:
       people_on_pod_are_aware_of: "La gente que está en POD son conscientes de"
       results_for: "Resultados para %{params}"
     index: 
-      couldnt_find_them_send_invite: "¿No los puedes encontrar? ¡Envíales una invitación!"
+      couldnt_find_them_send_invite: "¿No les puedes encontrar? ¡Envíales una invitación!"
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Eh! ¡Tienes que buscar algo!"
       results_for: "Resultados para"
@@ -507,6 +514,7 @@ es:
     update: 
       failed: "Error actualizando el perfil"
       updated: "Perfil actualizado"
+  public: "Public"
   registrations: 
     closed: "Los registros están cerrados en este servidor Diaspora*"
     create: 
@@ -569,6 +577,7 @@ es:
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "Conectar como"
+      no_services: "You have not connected any services yet."
       really_disconnect: "¿Desconectar %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Haz click aquí para aceptar tu invitación"
@@ -625,8 +634,10 @@ es:
     stream_element: 
       dislike: "No me gusta"
       like: "Me gusta"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "No me gusta"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
@@ -649,28 +660,34 @@ es:
   stream_helper: 
     hide_comments: "Ocultar comentarios"
     show_more_comments: "Muestra %{number} comentarios más"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nadie esta hablando de %{tag} todavía."
       people_tagged_with: "Personas etiquetadas en %{tag}"
       posts_tagged_with: "Publicaciones etiquetadas con #%{tag}"
-  the_world: "el mundo"
+      stop_following: "Stop Following #%{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."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      generate_a_token: "Generar un token"
+      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."
       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}."
       sign_up_today: "Regístrate hoy mismo!"
       typical_userpage: "Una típica pagina de usuario de cubbi.es"
       via: "(via %{link})"
-      were_working_hard: "Estamos trabajando intensamente para ofrecer una conectividad sencilla entre servidores y aplicaciones de Diaspora. Mientras tanto, conectar Diaspora* con Cubbi.es solo es copiar y pegar dos campos."
       what_is_cubbies: "Cubbi.es es la primera aplicación de Diaspora en el mundo.  Es también la mejor forma de coleccionar fotos en linea."
-      your_diaspora_handle: "Tu identificador de Diaspora*:"
-      your_diaspora_token: "Tu token en Diaspora:"
   undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
@@ -698,7 +715,7 @@ es:
     getting_started: 
       connect_on_diaspora: "Conectar en Diaspora*"
       connect_services: "Conecta tus otros servicios"
-      could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Use el buscador de amigos para invitarlos."
+      could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Usa el buscador de contactos para invitarles."
       edit_profile: "Edita tu perfil"
       finished: "¡Terminado!"
       save_and_continue: "Guardar y continuar"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 05b46b55464424aac7763f2fc7f83538184dd421..9559a96d9eb6810fb420f995d382cbdf61581fe5 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -106,6 +106,10 @@ eu:
       no_contacts: "Adiskiderik ez"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Zure Alderdiak"
     many: "%{count} alderdi"
     move_contact: 
@@ -194,6 +198,7 @@ eu:
       no_conversation_selected: "ez da aukeratu elkarrizketarik"
       no_messages: "mezurik ez"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Bidali"
       subject: "gaia"
       to: "nori:"
@@ -267,6 +272,7 @@ eu:
       logout: "irten"
       profile: "profila"
       settings: "lehentasunak"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ eu:
         one: "%{count}ek du gustoko"
         other: "%{count} pertsonek gustoko dute hau"
         zero: "oraindik ez du inork gustoko"
+  limited: "Limited"
   more: "Gehiago"
   next: "hurrengoa"
   no_results: "Ez Da Ezer Aurkitu"
@@ -507,6 +514,7 @@ eu:
     update: 
       failed: "Huts profila eguneratzean"
       updated: "Profila eguneratu duzu."
+  public: "Public"
   registrations: 
     closed: "Izen emateak itxirik daude Diaspora zerbitzari hontan."
     create: 
@@ -569,6 +577,7 @@ eu:
       disconnect: "irten"
       edit_services: "Aldatu zerbitzuak"
       logged_in_as: "Lotuta duzun kontua honakoa da:"
+      no_services: "You have not connected any services yet."
       really_disconnect: "irten %{service}(e)tik?"
     inviter: 
       click_link_to_accept_invitation: "Jarraitu esteka hau zure gonbidapena onartzeko"
@@ -625,8 +634,10 @@ eu:
     stream_element: 
       dislike: "Ez dut gustoko"
       like: "Gustoko dut"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Ez dut gustoko"
       via: "%{link}(r)en bidez"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Arrakastaz aipatu dituzu: %{names}"
@@ -649,28 +660,34 @@ eu:
   stream_helper: 
     hide_comments: "Iruzkin guztiak ezkutatu"
     show_more_comments: "Erakutsi %{number} iruzkin gehiago"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Inor ez du %{tag}(r)i buruz hitz egin oraindik."
       people_tagged_with: "%{tag} etiketadun jendea"
       posts_tagged_with: "#%{tag} etiketadun mezuak"
-  the_world: "mundua"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Cubbi.es-era lotu"
       connecting_is_simple: "Diaspora kontua oso sinplea da: soilik bi eremu bete behar dituzu zure Cubbi.es erabiltzaile orrialdean."
       daniels_account: "Danielen Diaspora kontua"
-      generate_a_token: "Kodea sortu"
+      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."
       love_to_try: "Zuk probatzea gustatuko litzaiguke."
       making_the_connection: "Lotura Ezartzen"
       screenshot_explanation: "%{link1}. Cubby hau %{link2}(r)ekin lotuta dago."
       sign_up_today: "Izena eman oraintxe!"
       typical_userpage: "Cubbi.es erabiltzaile orrialde tipiko bat"
       via: "(%{link}(r)en bidez)"
-      were_working_hard: "Gogor ari gara lanean Diaspora zerbitzarien eta aplikazioen arteko harremanak eskaintzeko. Momentuan, Diaspora eta Cubbi.es kontuak lotzeak bi eremu kopiatzean eta itsastean datza."
       what_is_cubbies: "Cubbi.es munduko lehen Diaspora aplikazioa da. Argazkiak metatzeko biderik onena ere da."
-      your_diaspora_handle: "Zure Diaspora IDa:"
-      your_diaspora_token: "Zure Diaspora Kodea:"
   undo: "Desegin?"
   username: "Erabiltzailea"
   users: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index cb304106740f2f0746cd54cc79296ba01912f932..ffb2c9fd2de3a965ca13598c67ead14e56f7f5b9 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -106,6 +106,10 @@ fi:
       no_contacts: "Ei kontakteja"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Näkymäsi"
     many: "%{count} näkymää"
     move_contact: 
@@ -194,6 +198,7 @@ fi:
       no_conversation_selected: "ei valittua keskustelua"
       no_messages: "ei viestejä"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Lähetä"
       subject: "aihe"
       to: "vastaanottaja"
@@ -267,6 +272,7 @@ fi:
       logout: "kirjaudu ulos"
       profile: "Profiili"
       settings: "Asetukset"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ fi:
         one: "%{count} tykkää"
         other: "%{count} tykkää"
         zero: "ei tykkäyksiä"
+  limited: "Limited"
   more: "Lisää"
   next: "seuraava"
   no_results: "Tuloksia ei löytynyt"
@@ -507,6 +514,7 @@ fi:
     update: 
       failed: "Profiilin päivitys epäonnistui"
       updated: "Profiili päivitetty"
+  public: "Public"
   registrations: 
     closed: "Rekisteröityminen on suljettu tässä Diaspora-podissa."
     create: 
@@ -569,6 +577,7 @@ fi:
       disconnect: "katkaise"
       edit_services: "Muokkaa palveluita"
       logged_in_as: "kirjautunut käyttäjänä"
+      no_services: "You have not connected any services yet."
       really_disconnect: "katkaise %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Paina tätä linkkiä hyväksyäksesi kutsun"
@@ -625,8 +634,10 @@ fi:
     stream_element: 
       dislike: "En tykkää"
       like: "Tykkää"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ fi:
   stream_helper: 
     hide_comments: "piilota kommentit"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "maailma"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Peruuta?"
   username: "Käyttäjätunnus"
   users: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 09580079adbf6d2a505b2d6a20755924d036398f..2661274a0a7bf00c773b62dde803d53dda95524e 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -63,12 +63,12 @@ fr:
     aspect_contacts: 
       done_editing: "fin de la modification"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Ajouter un aspect"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "a/ont commenté"
+      posted: "publié"
+      recently: "récemment :"
+      stream: "Flux"
     contacts_not_visible: "Les contacts dans cet aspect ne se verront pas les uns les autres."
     contacts_visible: "Les contacts dans cet aspect pourront se voir entre eux."
     create: 
@@ -99,14 +99,18 @@ fr:
         heading: "Connectez-vous à Cubbi.es"
         learn_more: "En savoir plus"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Ceci est votre handle diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
+        content_1: "Votre identifiant Diaspora est :"
+        content_2: "Communiquez-le à tout le monde et ils pourront vous trouver sur Diaspora."
+        heading: "Identifiant Diaspora"
+      handle_explanation: "Ceci est votre identifiant diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
       no_contacts: "Aucun contact"
       people_sharing_with_you: "Personnes partageant avec vous"
       post_a_message: "publier un message >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      your_aspects: "Vos aspects"
     many: "%{count} aspects"
     move_contact: 
       error: "Erreur lors du déplacement du contact : %{inspect}"
@@ -116,17 +120,17 @@ fr:
       create: "Créer"
       name: "Nom"
     no_posts_message: 
-      start_talking: "Personne n’a encore rien dit.  Engagez dès à présent la conversation !"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Personne n’a encore rien dit !"
+      try_adding_some_more_contacts: "Essayez d'ajouter d'autres contacts."
     one: "1 aspect"
     other: "%{count} aspects"
     seed: 
       family: "Famille"
       work: "Travail"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Gérer vos aspects."
+      no_contacts: "Vous n'avez encore aucun contact."
+      view_all_contacts: "Afficher tous les contacts"
     show: 
       edit_aspect: "modifier l'aspect"
     update: 
@@ -140,7 +144,7 @@ fr:
   bookmarklet: 
     explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
     explanation_link_text: "ce lien"
-    heading: "Marque-page Diaspora"
+    heading: "Bookmarklet"
     post_something: "Publier quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
@@ -160,12 +164,12 @@ fr:
     index: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
       all_contacts: "Tous les contacts"
-      edit_aspect: "Edit %{name}"
+      edit_aspect: "Modifier %{name}"
       my_contacts: "Mes Contacts"
       no_contacts: "Pas de contacts."
       only_sharing_with_me: "Partage uniquement avec moi"
       remove_person_from_aspect: "Enlever %{person_name} de \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Démarrer une conversation"
       title: "Contacts"
       your_contacts: "Vos contacts"
     many: "%{count} contacts"
@@ -185,7 +189,7 @@ fr:
         many: "%{count} nouveaux messages"
         one: "1 nouveau message"
         other: "%{count} nouveaux messages"
-        zero: "aucun nouveau message"
+        zero: "Aucun nouveau message"
     index: 
       create_a_new_message: "créer un nouveau message"
       inbox: "Boîte de réception"
@@ -194,6 +198,7 @@ fr:
       no_conversation_selected: "aucune conversation sélectionnée"
       no_messages: "aucun message"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Envoyer"
       subject: "sujet"
       to: "pour"
@@ -212,7 +217,7 @@ fr:
       correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
       invalid_fields: "Champs invalides"
   fill_me_out: "Remplissez-moi"
-  find_people: "Find people"
+  find_people: "Rechercher des personnes"
   hide: "Masquer"
   home: 
     show: 
@@ -267,6 +272,7 @@ fr:
       logout: "déconnexion"
       profile: "profil"
       settings: "paramètres"
+      view_all: "Tout afficher"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ fr:
         one: "%{count} personne aime"
         other: "%{count} personnes aiment"
         zero: "Personne n'aime ça"
+  limited: "Limited"
   more: "Plus"
   next: "suivant"
   no_results: "Aucun résultat trouvé"
@@ -301,15 +308,15 @@ fr:
       few: "%{actors} a/ont commenté %{post_link}."
       many: "%{actors} a/ont commenté %{post_link}."
       one: "%{actors} a/ont commenté %{post_link}."
-      other: "%{actors} a commenté sur votre %{post_link}."
-      zero: "%{actors} a commenté sur votre %{post_link}."
+      other: "%{actors} a/ont commenté votre %{post_link}."
+      zero: "%{actors} a/ont commenté votre %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} nouvelles notifications"
         many: "%{count} nouvelles notifications"
         one: "1 nouvelle notification"
         other: "%{count} nouvelles notifications"
-        zero: "aucune nouvelle notification"
+        zero: "Aucune nouvelle notification"
     index: 
       and: "et"
       and_others: 
@@ -507,6 +514,7 @@ fr:
     update: 
       failed: "Impossible de mettre à jour le profil"
       updated: "Profil mis à jour"
+  public: "Public"
   registrations: 
     closed: "Les inscriptions sont fermées sur ce pod Diaspora."
     create: 
@@ -569,6 +577,7 @@ fr:
       disconnect: "déconnecter"
       edit_services: "Modifier les services"
       logged_in_as: "connecté(e) en tant que"
+      no_services: "You have not connected any services yet."
       really_disconnect: "déconnecter %{service} ?"
     inviter: 
       click_link_to_accept_invitation: "Cliquer sur ce lien pour accepter l'invitation"
@@ -580,8 +589,8 @@ fr:
   shared: 
     add_contact: 
       add_new_contact: "Ajouter un nouveau contact"
-      create_request: "Rechercher par handle Diaspora"
-      diaspora_handle: "diaspora@handle.org"
+      create_request: "Rechercher par identifiant Diaspora"
+      diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
       know_email: "Vous connaissez leur adresse de courrier électronique ? Vous devriez les inviter"
       your_diaspora_username_is: "Votre nom d'utilisateur Diaspora est : %{diaspora_handle}"
@@ -610,7 +619,7 @@ fr:
       all: "tous"
       all_contacts: "tous les contacts"
       click_to_share_with: "Cliquez pour partager avec : "
-      discard_post: "Discard post"
+      discard_post: "Supprimer la publication"
       make_public: "rendre public"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
@@ -618,15 +627,17 @@ fr:
       publishing_to: "publication vers : "
       share: "Partager"
       share_with: "Partager avec"
-      upload_photos: "Upload photos"
+      upload_photos: "Envoyer des photos"
       whats_on_your_mind: "exprimez-vous"
     reshare: 
       reshare: "Repartager"
     stream_element: 
       dislike: "Je n'aime pas"
       like: "J'aime"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Je n'aime pas"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
@@ -647,30 +658,36 @@ fr:
       other: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
       zero: "s'il vous plaît, veuillez écrire des messages de moins de %{count} caractères"
   stream_helper: 
-    hide_comments: "masquer les commentaires"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "Masquer tous les commentaires"
+    show_more_comments: "Afficher %{number} commentaires supplémentaires"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Personne ne parle encore de %{tag}."
       people_tagged_with: "Personnes taguées avec %{tag}"
       posts_tagged_with: "Publications taguées avec #%{tag}"
-  the_world: "tout le monde"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Se connecter à Cubbi.es"
       connecting_is_simple: "La connexion de votre compte Diaspora est assez simple puisqu'il suffit de saisir deux champs sur votre page de compte Cubbi.es."
       daniels_account: "Le compte Diaspora de Daniel"
-      generate_a_token: "Générer un jeton"
+      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."
       love_to_try: "Nous aimerions beaucoup que vous essayiez."
       making_the_connection: "Créez la connexion"
       screenshot_explanation: "%{link1}. Cette page cubbi est liée à %{link2}."
       sign_up_today: "Inscrivez-vous dès aujourd'hui !"
       typical_userpage: "Une page d'utilisateur typique sur cubbi.es"
       via: "(via %{link})"
-      were_working_hard: "Nous travaillons dur pour permettre de connecter facilement les pods Diaspora et les applications. En attendant, pour connecter votre compte Diaspora avec Cubbi.es il est nécessaire de copier et coller deux champs."
       what_is_cubbies: "Cubbi.es est la toute première application Diaspora. C'est aussi la meilleure manière de collectionner des photos en ligne."
-      your_diaspora_handle: "Votre handle Diaspora :"
-      your_diaspora_token: "Votre clé Diaspora :"
   undo: "Annuler ?"
   username: "Nom d'utilisateur"
   users: 
@@ -694,7 +711,7 @@ fr:
       receive_email_notifications: "Recevoir des notifications par courrier électronique lorsque…"
       started_sharing: "...quelqu'un commence à partager avec vous ?"
       your_email: "Votre adresse électronique"
-      your_handle: "Votre handle diaspora"
+      your_handle: "Votre identifiant diaspora"
     getting_started: 
       connect_on_diaspora: "Se connecter sur Diaspora"
       connect_services: "Connectez vos autres services"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 4398ed31f44e871da14ee3fffa260a196c778a37..621894fd18d9c50f656552b29236cae0fea79149 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -106,6 +106,10 @@ ga:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ ga:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ ga:
       logout: "logáil amach"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ga:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "ar aghaidh"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ ga:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Tá síniú suas dúnta ar an phod Diaspora seo."
     create: 
@@ -569,6 +577,7 @@ ga:
       disconnect: "disconnect"
       edit_services: "Athraigh seirbhísí"
       logged_in_as: "logáilte isteach mar"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ ga:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ ga:
   stream_helper: 
     hide_comments: "folaigh nótaí tráchta"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "an domhain"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Ainm úsáideora"
   users: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 9a8c762003b7ed1204584d446943db4ecc0f9a34..cf82ffb70477bdb70f650cf7cb9f5fd04566a672 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -106,6 +106,10 @@ he:
       no_contacts: "אין אנשי קשר"
       people_sharing_with_you: "אנשים המשתפים אתך"
       post_a_message: "פרסום הודעה >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} היבטים"
     move_contact: 
@@ -194,6 +198,7 @@ he:
       no_conversation_selected: "לא נבחר דיון"
       no_messages: "אין הודעות"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "שליחה"
       subject: "נושא"
       to: "אל"
@@ -267,6 +272,7 @@ he:
       logout: "יציאה"
       profile: "פרופיל"
       settings: "הגדרות"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ he:
         one: "אדם אחד אהב את זה"
         other: "%{count} אנשים אהבו את זה"
         zero: "אף אחד לא אהב את זה"
+  limited: "Limited"
   more: "המשך"
   next: "הבאה"
   no_results: "לא נמצאו תוצאות"
@@ -507,6 +514,7 @@ he:
     update: 
       failed: "אירע כשל בעדכון הפרופיל"
       updated: "הפרופיל עודכן"
+  public: "Public"
   registrations: 
     closed: "אפשרות ההרשמה סגורה בפוד זה של דיאספורה."
     create: 
@@ -569,6 +577,7 @@ he:
       disconnect: "ניתוק"
       edit_services: "עריכת שירותים"
       logged_in_as: "נכנסת בשם"
+      no_services: "You have not connected any services yet."
       really_disconnect: "האם לנתק את %{service}?"
     inviter: 
       click_link_to_accept_invitation: "יש ללחוץ על קישור זה כדי לקבל את ההזמנה שלך"
@@ -625,8 +634,10 @@ he:
     stream_element: 
       dislike: "לא אהבתי את זה"
       like: "אהבתי"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "לא אהבתי"
       via: "באמצעות %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "אוזכרו בהצלחה: %{names}"
@@ -649,28 +660,34 @@ he:
   stream_helper: 
     hide_comments: "הסתרת הערות"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "אף אחד עדיין לא דיבר על %{tag}."
       people_tagged_with: "אנשים תויגו ב־%{tag}"
       posts_tagged_with: "אנשים תויגו ב־%{tag}"
-  the_world: "העולם"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "התחברות ל־Cubbi.es"
       connecting_is_simple: "חיבור חשבון הדיאספורה שלך הנה משימה פשוטה של מילוי שני שדות בחשבון ה־Cubbi.es שלך."
       daniels_account: "חשבון הדיאספורה של דניאל"
-      generate_a_token: "יצירת אסימון"
+      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."
       love_to_try: "נשמח אם תנסו זאת."
       making_the_connection: "יצירת הקשר"
       screenshot_explanation: "%{link1}.  ה־cubby המסוים הזה מקושר שלך %{link2}."
       sign_up_today: "הירשמו עוד היום!"
       typical_userpage: "דף משתמש טיפוסי ב־cubbi.es"
       via: "(באמצעות %{link})"
-      were_working_hard: "אנו עמלים קשה כדי להביא לכם תקשורת פשוטה בין הפודים של דיאספורה ומגוון היישומים. לבינתיים, התחברות עם חשבון הדיאספורה שלך ל־Cubbi.es הנה עניין פשוט של העתקה והדבקה של שני שדות."
       what_is_cubbies: "Cubbi.es הנו היישום הראשון לדיאספורה אי פעם. זוהי גם הדרך הטובה ביותר לאסוף תמונות באופן מקוון."
-      your_diaspora_handle: "הכינוי שלך בדיאספורה:"
-      your_diaspora_token: "האסימון שלך בדיאספורה:"
   undo: "האם לבטל?"
   username: "שם משתמש"
   users: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 4c83a3ddf819818788c9d53143da7ab7eb3a12a0..997aea7babbee04e729fc8521286e22ddc7774ca 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -106,6 +106,10 @@ hu:
       no_contacts: "Nincs ismerős"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "üzenet küldése >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} csoport"
     move_contact: 
@@ -194,6 +198,7 @@ hu:
       no_conversation_selected: "nincs beszélgetés kiválasztva"
       no_messages: "nincs üzenet"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Küldés"
       subject: "tárgy"
       to: "címzett"
@@ -267,6 +272,7 @@ hu:
       logout: "kijelentkezés"
       profile: "profil"
       settings: "beállítások"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ hu:
         one: "1 személy kedveli"
         other: "%{count} személy kedveli"
         zero: "senki nem kedveli"
+  limited: "Limited"
   more: "BÅ‘vebben"
   next: "következő"
   no_results: "Nincs eredmény"
@@ -507,6 +514,7 @@ hu:
     update: 
       failed: "Profil frissítése sikertelen"
       updated: "Profil frissítve"
+  public: "Public"
   registrations: 
     closed: "A regisztráció zárva ezen a Diaspora kiszolgálón."
     create: 
@@ -569,6 +577,7 @@ hu:
       disconnect: "Megszakít"
       edit_services: "Szolgáltatások szerkesztése"
       logged_in_as: "Bejelentkezve, mint"
+      no_services: "You have not connected any services yet."
       really_disconnect: "Megszakítod a kapcsolatot ezzel: %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kattints a linkre, hogy elfogadd a meghívást."
@@ -625,8 +634,10 @@ hu:
     stream_element: 
       dislike: "Nem tetszik"
       like: "Tetszik"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Megemlítetted: %{names}"
@@ -649,28 +660,34 @@ hu:
   stream_helper: 
     hide_comments: "hozzászólások elrejtése"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Senki nem beszélt még erről: %{tag}."
       people_tagged_with: "Személy felcímkézve: %{tag}"
       posts_tagged_with: "Bejegyzések felcímkézve: #%{tag}"
-  the_world: "a világ"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Visszavonod?"
   username: "Felhasználónév"
   users: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 47cf52c03fd26b6997539a894fc3f330230ff05d..0daa9befd0bb029aec15c361448f218cbed3416b 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -106,6 +106,10 @@ id:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ id:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ id:
       logout: "logout"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ id:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "next"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ id:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ id:
       disconnect: "disconnect"
       edit_services: "Edit services"
       logged_in_as: "logged in as"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ id:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ id:
   stream_helper: 
     hide_comments: "hide comments"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "the world"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Username"
   users: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index aa661ff501c59c8f8181f4b36a6d7108970916f7..e8e29532201e63b4494327c408d2e91d3a64be6a 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -106,6 +106,10 @@ is:
       no_contacts: "Engir tengiliðir"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ is:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ is:
       logout: "Útskrá"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ is:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "Meira"
   next: "næsta"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ is:
     update: 
       failed: "Ekki tókst að uppfæra síðuna mína"
       updated: "Síðan mín uppfærð"
+  public: "Public"
   registrations: 
     closed: "Innskráningar eru lokaðar á þessum Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ is:
       disconnect: "aftengja"
       edit_services: "Breyta þjónustum"
       logged_in_as: "innskráning þín sem "
+      no_services: "You have not connected any services yet."
       really_disconnect: "aftengja %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Smelltu á þessa krækju til að þiggja boðið"
@@ -625,8 +634,10 @@ is:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ is:
   stream_helper: 
     hide_comments: "fela athugasemdir"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "veröldin"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Notandanafn"
   users: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index b55a42bd21f072f3d1f61ba2c4945dc089dcffc2..6b4e616ac59b3539a3b2e1c893c6ee59a7b8bb6d 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -65,9 +65,9 @@ it:
     aspect_listings: 
       add_an_aspect: "+ Aggiungi un aspetto"
     aspect_stream: 
-      commented_on: "ha commentato"
-      posted: "pubblicati"
-      recently: "recentemente:"
+      commented_on: "commenti"
+      posted: "post"
+      recently: "ordina per:"
       stream: "Stream"
     contacts_not_visible: "I contatti in questo aspetto non potranno vedersi tra loro."
     contacts_visible: "I contatti in questo aspetto potranno vedersi tra loro."
@@ -99,13 +99,17 @@ it:
         heading: "Connettiti a Cubbi.es"
         learn_more: "Per saperne di più"
       diaspora_id: 
-        content_1: "Il tuo Diaspora ID è:"
-        content_2: "Dallo a chi vuoi perché possa trovarti su Diaspora."
-        heading: "Diaspora ID"
-      handle_explanation: "Questo è il tuo contatto Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
+        content_1: "Il tuo ID è:"
+        content_2: "Chi lo conosce potrà trovarti facilmente su Diaspora, spargi la voce!"
+        heading: "ID Diaspora"
+      handle_explanation: "Questo è il tuo ID su Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       no_contacts: "Nessun contatto"
       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"
       your_aspects: "I tuoi aspetti"
     many: "%{count} aspetti"
     move_contact: 
@@ -194,6 +198,7 @@ it:
       no_conversation_selected: "nessuna conversazione selezionata"
       no_messages: "nessun messaggio"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Invia"
       subject: "oggetto"
       to: "a"
@@ -267,6 +272,7 @@ it:
       logout: "esci"
       profile: "profilo"
       settings: "impostazioni"
+      view_all: "Elenco completo"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ it:
         one: "%{count} Mi piace"
         other: "%{count} Mi piace"
         zero: "0 Mi piace"
+  limited: "Limited"
   more: "Altro"
   next: "successivo"
   no_results: "Nessun Risultato Trovato"
@@ -507,6 +514,7 @@ it:
     update: 
       failed: "Aggiornamento del profilo non riuscito"
       updated: "Profilo aggiornato"
+  public: "Public"
   registrations: 
     closed: "Le iscrizioni sono chiuse su questo pod Diaspora."
     create: 
@@ -569,6 +577,7 @@ it:
       disconnect: "disconnetti"
       edit_services: "Modifica servizi"
       logged_in_as: "accesso effettuato come"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnettere %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Fai click su questo link per accettare l'invito"
@@ -580,11 +589,11 @@ it:
   shared: 
     add_contact: 
       add_new_contact: "Aggiungi un nuovo contatto"
-      create_request: "Cerca fra i nomi utente Diaspora"
+      create_request: "Cerca per ID"
       diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Inserisci un nome utente Diaspora"
       know_email: "Conosci i loro indirizzi email? Dovresti invitarli"
-      your_diaspora_username_is: "Il tuo nome utente Diaspora è: %{diaspora_handle}"
+      your_diaspora_username_is: "Il tuo ID è: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Tutti i contatti"
     footer: 
@@ -625,8 +634,10 @@ it:
     stream_element: 
       dislike: "Non mi piace"
       like: "Mi piace"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Annulla"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Menzionati con successo: %{names}"
@@ -649,28 +660,34 @@ it:
   stream_helper: 
     hide_comments: "nascondi i commenti"
     show_more_comments: "Mostra gli altri %{number} commenti"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nessuno sta ancora parlando di %{tag}."
       people_tagged_with: "Persone etichettate come %{tag}"
       posts_tagged_with: "Post etichettati come #%{tag}"
-  the_world: "il mondo"
+      stop_following: "Stop Following #%{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"
-      generate_a_token: "Genera un token"
+      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."
       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}."
       sign_up_today: "Registrati oggi!"
       typical_userpage: "Una tipica pagina utente di cubbi.es"
       via: "(via %{link})"
-      were_working_hard: "Stiamo lavorando sodo per creare una connettività semplice tra i pod di Diaspora ed applicazioni esterne. Nel frattempo, collegare il tuo account Diaspora con Cubbi.es consiste nel copiare e incollare due campi testuali."
       what_is_cubbies: "Cubbi.es è la prima applicazione Diaspora nel mondo.  E' anche il miglior modo di raccogliere le foto online."
-      your_diaspora_handle: "Il tuo Diaspora ID:"
-      your_diaspora_token: "Il tuo token Diaspora:"
   undo: "Annullare?"
   username: "Nome Utente"
   users: 
@@ -694,7 +711,7 @@ it:
       receive_email_notifications: "Ricevi notifiche via email quando..."
       started_sharing: "...qualcuno vuole condividere con te?"
       your_email: "La tua email"
-      your_handle: "Il tuo Diaspora ID"
+      your_handle: "Il tuo ID"
     getting_started: 
       connect_on_diaspora: "Connetti su Diaspora"
       connect_services: "Collega altri tuoi servizi"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 2071658ee98eea8adc0f3eb20b936dc9b1548dbd..25f2f6f31f8cf50c67f44cd73bd42b4af596a356 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -106,6 +106,10 @@ ja:
       no_contacts: "連絡先無し"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "投稿する"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "アスペクト%{count}集"
     move_contact: 
@@ -194,6 +198,7 @@ ja:
       no_conversation_selected: "選択中の会話がありません"
       no_messages: "メッセージがありません"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "送信する"
       subject: "件名"
       to: "宛先"
@@ -267,6 +272,7 @@ ja:
       logout: "ログアウト"
       profile: "プロフィール"
       settings: "設定"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ja:
         one: "これが好きな人：1人"
         other: "これが好きな人：%{count}人"
         zero: "これが好きな人：0人"
+  limited: "Limited"
   more: "続き"
   next: "次へ"
   no_results: "詮索結果はありません"
@@ -507,6 +514,7 @@ ja:
     update: 
       failed: "プロフィール更新に失敗しました"
       updated: "プロフィールを更新しました"
+  public: "Public"
   registrations: 
     closed: "このダイアスポラ＊ポッドでは新規登録を受け付けていません。"
     create: 
@@ -569,6 +577,7 @@ ja:
       disconnect: "切断"
       edit_services: "サービスを編集する"
       logged_in_as: "ログイン済みユーザ名："
+      no_services: "You have not connected any services yet."
       really_disconnect: "%{service}から切断しますか。"
     inviter: 
       click_link_to_accept_invitation: "招待を承諾するにはこのリンクにクリックしてください。"
@@ -625,8 +634,10 @@ ja:
     stream_element: 
       dislike: "これ嫌い！"
       like: "これ好き！"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "%{names}を参照するのに成功しました。"
@@ -649,28 +660,34 @@ ja:
   stream_helper: 
     hide_comments: "コメントを非表示にする"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "%{tag}についての投稿はまだありません。"
       people_tagged_with: "%{tag}とタグ付けられている人々"
       posts_tagged_with: "#%{tag}とタグ付けられている投稿"
-  the_world: "全世界"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "元に戻す"
   username: "ユーザ名"
   users: 
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index d23a067d3bd74a18078413a61dbd63988eb21f0c..6037d5fe10b1b7343b922e422c7dc7a01b5f25f3 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -4,9 +4,9 @@
 
 
 ko: 
-  _applications: "Applications"
+  _applications: "애플리케이션"
   _comments: "댓글"
-  _contacts: "Contacts"
+  _contacts: "컨택"
   _home: "처음"
   _photos: "사진"
   _services: "서비스"
@@ -63,12 +63,12 @@ ko:
     aspect_contacts: 
       done_editing: "고치기 완료"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ 애스펙 추가"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
-      stream: "Stream"
+      commented_on: "댓글 달린 순"
+      posted: "올린 순"
+      recently: "최근에"
+      stream: "스트림"
     contacts_not_visible: "이 애스펙에 있는 사람들이 서로를 볼 수 없습니다."
     contacts_visible: "이 애스펙에 있는 사람들이 서로를 볼 수 있습니다."
     create: 
@@ -99,14 +99,18 @@ ko:
         heading: "Cubbi.es에 연결하기"
         learn_more: "자세히 알아보기"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
+        content_1: "내 디아스포라 ID:"
+        content_2: "내 ID를 주면 누구든지 디아스포라에서 날 찾을수 있습니다."
+        heading: "디아스포라 ID"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       no_contacts: "컨택 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
+      your_aspects: "내 애스펙"
     many: "애스펙 %{count}개"
     move_contact: 
       error: "%{inspect} 컨택을 옮기는데 에러가 발생했습니다."
@@ -117,16 +121,16 @@ ko:
       name: "이름"
     no_posts_message: 
       start_talking: "아직 아무 이야기도 없습니다. 대화를 시작하세요!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      try_adding_some_more_contacts: "컨택을 더 추가해보세요."
     one: "애스펙 한 개"
     other: "애스펙 %{count}개"
     seed: 
       family: "가족"
       work: "직장"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "내 애스펙 관리하기."
+      no_contacts: "아직 컨택이 없습니다."
+      view_all_contacts: "모든 컨택 보기"
     show: 
       edit_aspect: "애스펙 고치기"
     update: 
@@ -135,7 +139,7 @@ ko:
     zero: "애스펙 없음"
   authorizations: 
     index: 
-      revoke_access: "Revoke Access"
+      revoke_access: "접속권한 취소"
   back: "돌아가기"
   bookmarklet: 
     explanation: "%{link} 링크를 북마크로 추가하세요."
@@ -160,12 +164,12 @@ ko:
     index: 
       add_a_new_aspect: "새 애스펙 추가"
       all_contacts: "모든 컨택"
-      edit_aspect: "Edit %{name}"
+      edit_aspect: "%{name} 고치기"
       my_contacts: "내 컨택"
       no_contacts: "컨택 없음."
-      only_sharing_with_me: "Only sharing with me"
+      only_sharing_with_me: "나와만 공유하고 있는 사람들"
       remove_person_from_aspect: "\"%{aspect_name} 애스펙에서 %{person_name}님 지우기"
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "대화를 시작하세요"
       title: "컨택"
       your_contacts: "내 컨택"
     many: "컨택 %{count}명"
@@ -194,6 +198,7 @@ ko:
       no_conversation_selected: "대화를 고르지 않았습니다"
       no_messages: "쪽지 없음"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "보내기"
       subject: "제목"
       to: "받는이"
@@ -212,7 +217,7 @@ ko:
       correct_the_following_errors_and_try_again: "아래의 에러를 정정한 뒤 다시 시도하십시오."
       invalid_fields: "유효하지 않은 항목"
   fill_me_out: "채워주세요"
-  find_people: "Find people"
+  find_people: "사람 찾기"
   hide: "숨기기"
   home: 
     show: 
@@ -267,6 +272,7 @@ ko:
       logout: "로그아웃"
       profile: "프로필"
       settings: "설정"
+      view_all: "모두 보기"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ko:
         one: "한 명이 좋아합니다"
         other: "%{count}명이 좋아합니다"
         zero: "아무도 좋아하지 않습니다"
+  limited: "Limited"
   more: "더"
   next: "다음"
   no_results: "결과 없음"
@@ -507,6 +514,7 @@ ko:
     update: 
       failed: "프로필 갱신 실패"
       updated: "프로필을 갱신했습니다"
+  public: "Public"
   registrations: 
     closed: "우리 디아스포라 팓은 가입이 닫혀있습니다."
     create: 
@@ -569,6 +577,7 @@ ko:
       disconnect: "끊기"
       edit_services: "서비스 설정"
       logged_in_as: "로그인 중: "
+      no_services: "You have not connected any services yet."
       really_disconnect: "%{service} 서비스를 끊으시겠습니까?"
     inviter: 
       click_link_to_accept_invitation: "초대를 수락려면 클릭하세요!"
@@ -610,7 +619,7 @@ ko:
       all: "모두"
       all_contacts: "모든 컨택"
       click_to_share_with: "공유할 대상을 클릭:"
-      discard_post: "Discard post"
+      discard_post: "공유물 삭제"
       make_public: "공개하기"
       post_a_message_to: "%{aspect}에 공유물 올리기"
       posting: "올리는 중···"
@@ -618,15 +627,17 @@ ko:
       publishing_to: "올릴 곳: "
       share: "공유"
       share_with: "공유하기: "
-      upload_photos: "Upload photos"
+      upload_photos: "사진 올리기"
       whats_on_your_mind: "무슨 생각해요?"
     reshare: 
       reshare: "재공유"
     stream_element: 
       dislike: "싪어요"
       like: "좋아요"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "좋아요 취소"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "%{names}님을 성공적으로 멘션했습니다."
@@ -648,29 +659,35 @@ ko:
       zero: "공유할 메시지를 %{count}자보다 적게 줄여주세요"
   stream_helper: 
     hide_comments: "댓글 감추기"
-    show_more_comments: "Show %{number} more comments"
+    show_more_comments: "댓글 %{number}개 더 보기"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "아직 %{tag} 태그가 달린 공유물이 없습니다."
       people_tagged_with: "%{tag} 태그가 달린 사람들"
       posts_tagged_with: "#%{tag} 태그가 달린 공유물"
-  the_world: "공개"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Cubbi.es에 연결하기"
       connecting_is_simple: "내 Cubbi.es에 있는 account 메뉴의 두 항목을 채워넣기만 하면 내 다이스포라 계정을 연결할 수 있습니다."
       daniels_account: "Daniel님의 디아스포라 계정"
-      generate_a_token: "토큰 생성하기"
+      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."
       love_to_try: "꼭 써보세요!"
       making_the_connection: "연결하기"
       screenshot_explanation: "%{link1}. 이 cubby는 %{link2}에 연결되어 있습니다."
       sign_up_today: "지금 가입하세요!"
       typical_userpage: "전형적인 cubbi.es 사용자 페이지"
       via: "(via %{link})"
-      were_working_hard: "디아스포라 팓과 어플 사이의 쉬운 연결을 제공하기 위해 최선을 다 하고있습니다. 당분간 내 디아스포라 계정과 Cubbi.es를 연결하는 건 두 항목을 복사하여 붙여넣는 걸 뜻합니다."
       what_is_cubbies: "Cubbi.es 는 세계 최초의 디아스포라 어플입니다.  온라인으로 사진을 모을 수 있는 가장 좋은 방법이기도 합니다."
-      your_diaspora_handle: "내 디아스포라 핸들:"
-      your_diaspora_token: "내 디아스포라 토큰:"
   undo: "돌이키겠습니까?"
   username: "사용자명"
   users: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 635304ebe288fc1eebab558ed4a2794251edac50..f30c307b9d8b48eeda92bc552114fb5aeb6f9df8 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -106,6 +106,10 @@ lt:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ lt:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ lt:
       logout: "atsijungti"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ lt:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "next"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ lt:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Naujų paskyrų kūrimas šiame Diasporos serveryje yra uždarytas."
     create: 
@@ -569,6 +577,7 @@ lt:
       disconnect: "atjungti"
       edit_services: "Edit services"
       logged_in_as: "sujungta su"
+      no_services: "You have not connected any services yet."
       really_disconnect: "atjungti %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ lt:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ lt:
   stream_helper: 
     hide_comments: "nascondi i commenti"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "pasaulis"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Vartotojo vardas"
   users: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 160c89862e1f776063774bee9ae827a047dad367..5cce128fabc7411e89a7d09875adf8d136942209 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -106,6 +106,10 @@ mk:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ mk:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ mk:
       logout: "одјави се"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ mk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "next"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ mk:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Регистрирањето е затворено."
     create: 
@@ -569,6 +577,7 @@ mk:
       disconnect: "прекини"
       edit_services: "Edit services"
       logged_in_as: "најавен како"
+      no_services: "You have not connected any services yet."
       really_disconnect: "прекини %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ mk:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ mk:
   stream_helper: 
     hide_comments: "hide comments"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "светот"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Корисничко име"
   users: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index d5b90ce73b2aa2c0c15e7ef978305eaada997673..39796023e939d50ee2aa331887a13b9116eb169e 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -106,6 +106,10 @@ nb:
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspekter"
     move_contact: 
@@ -194,6 +198,7 @@ nb:
       no_conversation_selected: "ingen samtaler valgt"
       no_messages: "ingen meldinger"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "emne"
       to: "til"
@@ -267,6 +272,7 @@ nb:
       logout: "logg ut"
       profile: "profil"
       settings: "innstillinger"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ nb:
         one: "1 person liker dette"
         other: "%{count} personer liker dette"
         zero: "ingen liker dette"
+  limited: "Limited"
   more: "Mer"
   next: "neste"
   no_results: "Ingen resultater ble funnet"
@@ -507,6 +514,7 @@ nb:
     update: 
       failed: "Kunne ikke oppdatere profil"
       updated: "Profil oppdatert"
+  public: "Public"
   registrations: 
     closed: "Registreringer er stengt på denne Diaspora poden."
     create: 
@@ -569,6 +577,7 @@ nb:
       disconnect: "koble fra"
       edit_services: "Rediger tjenester"
       logged_in_as: "logget inn som"
+      no_services: "You have not connected any services yet."
       really_disconnect: "koble fra %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klikk denne linken for å akseptere invitasjonen din"
@@ -625,8 +634,10 @@ nb:
     stream_element: 
       dislike: "Liker ikke"
       like: "Liker"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Nevnte :%{navn}"
@@ -649,28 +660,34 @@ nb:
   stream_helper: 
     hide_comments: "skjul kommentarer"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Ingen snakker om %{tag} ennå."
       people_tagged_with: "Personer tagget med %{tag}"
       posts_tagged_with: "Innlegg tagget med #%{tag}"
-  the_world: "verden"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Angre?"
   username: "Brukernavn"
   users: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index d1a0be66a67a97eaa80c8adb7e72c0a3647fc99e..9351d18088c412c6afc8b61ff292f817713b9ac9 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -6,7 +6,7 @@
 nl: 
   _applications: "Applicaties"
   _comments: "Reacties"
-  _contacts: "Contacts"
+  _contacts: "Contacten"
   _home: "Home"
   _photos: "foto's"
   _services: "Services"
@@ -63,11 +63,11 @@ nl:
     aspect_contacts: 
       done_editing: "klaar met bewerken"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Voeg aspect toe"
     aspect_stream: 
-      commented_on: "commented on"
-      posted: "posted"
-      recently: "recently:"
+      commented_on: "op gereageerd"
+      posted: "geplaatst"
+      recently: "laatst:"
       stream: "Stream"
     contacts_not_visible: "Contacten in dit aspect zullen elkaar niet kunnen zien."
     contacts_visible: "Contacten in dit aspect zullen elkaar kunnen zien."
@@ -99,14 +99,18 @@ nl:
         heading: "Verbind met Cubbie.es"
         learn_more: "Vertel mij meer"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
-        content_2: "Give it to anyone and they'll be able to find you on Diaspora."
+        content_1: "Jou Diaspora ID is:"
+        content_2: "Geef deze aan mensen zodat ze je op Diaspora kunnen vinden."
         heading: "Diaspora ID"
-      handle_explanation: "Dit is jouw Diaspora handle. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
+      handle_explanation: "Dit is jouw Diaspora id. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
       no_contacts: "Geen contacten"
       people_sharing_with_you: "Mensen die met jou delen"
       post_a_message: "plaats een bericht >>"
-      your_aspects: "Your Aspects"
+      services: 
+        content: "Je kunt de volgende service met Diaspora verbinden:"
+        heading: "Verbind Services"
+      tags_following: "Gevolgde Tags"
+      your_aspects: "Jou aspecten"
     many: "%{count} aspecten"
     move_contact: 
       error: "Probleem bij het verplaatsen van contact: %{inspect}"
@@ -116,17 +120,17 @@ nl:
       create: "Aanmaken"
       name: "Naam"
     no_posts_message: 
-      start_talking: "Nog niemand heeft iets gezegd. Breng het gesprek op gang!"
-      try_adding_some_more_contacts: "Try adding some more contacts."
+      start_talking: "Nog niemand heeft iets gezegd!"
+      try_adding_some_more_contacts: "Voeg wat meer contacten toe."
     one: "1 aspect"
     other: "%{count} aspecten"
     seed: 
       family: "Familie"
       work: "Werk"
     selected_contacts: 
-      manage_your_aspects: "Manage your aspects."
-      no_contacts: "You don't have any contacts here yet."
-      view_all_contacts: "View all contacts"
+      manage_your_aspects: "Beheer je aspecten."
+      no_contacts: "Je hebt hier momenteel nog geen contacten."
+      view_all_contacts: "Bekijk alle contacten"
     show: 
       edit_aspect: "bewerk aspect"
     update: 
@@ -140,7 +144,7 @@ nl:
   bookmarklet: 
     explanation: "Post vanaf overal naar Diaspora door %{link} op te slaan."
     explanation_link_text: "deze link"
-    heading: "Diaspora Bookmarklet"
+    heading: "Bookmarklet"
     post_something: "Post iets naar Diaspora"
     post_success: "Gepost!"
   cancel: "Annuleren"
@@ -160,12 +164,12 @@ nl:
     index: 
       add_a_new_aspect: "Voeg een aspect toe"
       all_contacts: "Alle Contacten"
-      edit_aspect: "Edit %{name}"
+      edit_aspect: "Bewerk %{name}"
       my_contacts: "Mijn Contacten"
       no_contacts: "Geen contacten."
       only_sharing_with_me: "Delen alleen met mij"
       remove_person_from_aspect: "Verwijder %{person_name} uit \"%{aspect_name}\""
-      start_a_conversation: "Start a conversation"
+      start_a_conversation: "Start een conversatie"
       title: "Contacten"
       your_contacts: "Jouw Contacten"
     many: "%{count} contacten"
@@ -185,7 +189,7 @@ nl:
         many: "%{count} nieuwe berichten"
         one: "1 nieuw bericht"
         other: "%{count} nieuwe berichten"
-        zero: "geen nieuwe berichten"
+        zero: "Geen nieuwe berichten"
     index: 
       create_a_new_message: "maak een nieuw bericht"
       inbox: "Postvak In"
@@ -194,6 +198,7 @@ nl:
       no_conversation_selected: "geen conversatie geselecteerd"
       no_messages: "geen berichten"
     new: 
+      abandon_changes: "Wijzigingen annuleren?"
       send: "Verstuur"
       subject: "onderwerp"
       to: "aan"
@@ -212,7 +217,7 @@ nl:
       correct_the_following_errors_and_try_again: "Corrigeer de volgende fouten en probeer opnieuw."
       invalid_fields: "Ongeldige velden"
   fill_me_out: "Vul me in!"
-  find_people: "Find people"
+  find_people: "Vind mensen"
   hide: "Verbergen"
   home: 
     show: 
@@ -267,6 +272,7 @@ nl:
       logout: "log uit"
       profile: "profiel"
       settings: "instellingen"
+      view_all: "Bekijk alles"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ nl:
         one: "%{count} persoon vindt dit leuk"
         other: "%{count} mensen vinden dit leuk"
         zero: "niemand vindt dit leuk"
+  limited: "Beperkt"
   more: "Meer"
   next: "volgende"
   no_results: "Geen resultaten gevonden"
@@ -309,7 +316,7 @@ nl:
         many: "%{count} nieuwe notificaties"
         one: "1 nieuwe notificatie"
         other: "%{count} nieuwe notificaties"
-        zero: "geen nieuwe notificaties"
+        zero: "Geen nieuwe notificaties"
     index: 
       and: "en"
       and_others: 
@@ -507,6 +514,7 @@ nl:
     update: 
       failed: "Profiel bijwerken mislukt"
       updated: "Profiel bijgewerkt"
+  public: "Openbaar"
   registrations: 
     closed: "Registratie is gesloten op deze Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ nl:
       disconnect: "koppel los"
       edit_services: "Bewerk services"
       logged_in_as: "ingelogd als"
+      no_services: "Je hebt nog geen services verbonden."
       really_disconnect: "verbreek verbinding met %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klik op deze link om de uitnodiging te accepteren"
@@ -580,7 +589,7 @@ nl:
   shared: 
     add_contact: 
       add_new_contact: "Voeg een contact toe"
-      create_request: "Vind door middel van Diaspora handle"
+      create_request: "Vind door middel van Diaspora ID"
       diaspora_handle: "gebruikersnaam@pod.org"
       enter_a_diaspora_username: "Vul een Diaspora gebruikersnaam in:"
       know_email: "Weet je hun e-mailadres? Je zou ze uit moeten nodigen"
@@ -610,7 +619,7 @@ nl:
       all: "al"
       all_contacts: "alle contacten"
       click_to_share_with: "Klik om te delen met: "
-      discard_post: "Discard post"
+      discard_post: "Maak veld leeg"
       make_public: "maak openbaar"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
@@ -618,15 +627,17 @@ nl:
       publishing_to: "delen met: "
       share: "Delen"
       share_with: "deel met"
-      upload_photos: "Upload photos"
-      whats_on_your_mind: "waar denk je aan?"
+      upload_photos: "Upload fotos"
+      whats_on_your_mind: "Waar denk je aan?"
     reshare: 
       reshare: "Herdeel"
     stream_element: 
       dislike: "Vind ik niet meer leuk"
       like: "Vind ik leuk"
+      shared_with: "Gedeeld met: %{aspect_names}"
       unlike: "vind ik niet meer leuk"
       via: "via %{link}"
+      viewable_to_anyone: "Deze post is zichtbaar voor iedereen op het internet"
   status_messages: 
     create: 
       success: "Succesvol genoemd: %{names}"
@@ -647,30 +658,36 @@ nl:
       other: "statusberichten mogen niet langer zijn dan %{count} tekens"
       zero: "statusberichten mogen niet langer zijn dan %{count} tekens"
   stream_helper: 
-    hide_comments: "verberg reacties"
-    show_more_comments: "Show %{number} more comments"
+    hide_comments: "Verberg alle reacties"
+    show_more_comments: "Toon %{number} meer reacties"
+  tag_followings: 
+    create: 
+      failure: "Volgen mislukt: #%{name}"
+      success: "Volgen succesvol: #%{name}"
+    destroy: 
+      failure: "Stoppen met volgen mislukt: #%{name}"
+      success: "Succesvol gestopt met volgen: #%{name}"
   tags: 
     show: 
+      follow: "Volg #%{tag}"
+      following: "Volgt #%{tag}"
       nobody_talking: "Nog niemand heeft het over %{tag}."
       people_tagged_with: "Personen gemerkt met %{tag}"
       posts_tagged_with: "Berichten gemerkt met #%{tag}"
-  the_world: "de wereld"
+      stop_following: "Stop met volgende van #%{tag}"
   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."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Genereer een token"
+      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."
       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}."
       sign_up_today: "Wordt vandaag lid!"
       typical_userpage: "Een typische cubbi.es gebruikerspagina"
       via: "(via %{link})"
-      were_working_hard: "We zijn hard aan het werk om eenvoudige connectiviteit tussen Diaspora pods en applicaties mogelijk te maken. Ondertussen is het nodig om twee velden te knippen en te plakken als je je Diaspora account met Cubbi.es wilt koppelen."
       what_is_cubbies: "Cubbi.es is de eerste Diaspora applicatie ter wereld. Het is ook de beste manier om foto's online te verzamelen."
-      your_diaspora_handle: "Jouw Diaspora Handle:"
-      your_diaspora_token: "Jouw Diaspora Token:"
   undo: "Ongedaan maken?"
   username: "Gebruikersnaam"
   users: 
@@ -694,7 +711,7 @@ nl:
       receive_email_notifications: "Ontvang e-mail notificaties wanneer..."
       started_sharing: "...iemand met je begint te delen?"
       your_email: "Jouw e-mail"
-      your_handle: "Jouw Diaspora handle"
+      your_handle: "Jouw Diaspora ID"
     getting_started: 
       connect_on_diaspora: "Verbind op Diaspora"
       connect_services: "Verbind met je andere services"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index a090dfbe7f4bc30d8ccf96c6a8e652ae773ff1ee..35e7ec03d299ad2b81373d32c4d11c1ea8cdf5cf 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -106,6 +106,10 @@ pa:
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ pa:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ pa:
       logout: "ਲਾਗਆਉਟ"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ pa:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "ਹੋਰ"
   next: "ਅੱਗੇ"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ pa:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ pa:
       disconnect: "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕਰੋ"
       edit_services: "ਸਰਵਿਸ ਸੋਧ"
       logged_in_as: "ਇੰਝ ਲਾਗ ਕਰੋ"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ pa:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ pa:
   stream_helper: 
     hide_comments: "ਟਿੱਪਣੀਆਂ ਓਹਲੇ ਕਰੋ"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "the world"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "ਯੂਜ਼ਰ ਨਾਂ"
   users: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index cd9fbc23781c052f2872ba4956ec823fdbcc5bae..177442a5e0eb0c4b3e4f6f1054f7841a400bd135 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -106,6 +106,10 @@ pl:
       no_contacts: "Brak kontaktów"
       people_sharing_with_you: "Osoby dzielÄ…ce siÄ™ z tobÄ…"
       post_a_message: "napisz wiadomość >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspektów"
     move_contact: 
@@ -194,6 +198,7 @@ pl:
       no_conversation_selected: "nie wybrano wÄ…tku"
       no_messages: "brak wiadomości"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Wyślij"
       subject: "temat"
       to: "do"
@@ -267,6 +272,7 @@ pl:
       logout: "wyloguj"
       profile: "profil"
       settings: "ustawienia"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ pl:
         one: "1 osoba to polubiła"
         other: "%{count} osób polubiło to"
         zero: "nikt tego nie polubił"
+  limited: "Limited"
   more: "Więcej"
   next: "następny"
   no_results: "Nie znaleziono niczego"
@@ -507,6 +514,7 @@ pl:
     update: 
       failed: "Nie udało się zaktualizować profilu"
       updated: "Profil został pomyślnie zaktualizowany"
+  public: "Public"
   registrations: 
     closed: "Na tym podzie Diaspory rejestracja jest zamknięta"
     create: 
@@ -569,6 +577,7 @@ pl:
       disconnect: "rozłącz"
       edit_services: "Edytuj usługi"
       logged_in_as: "zalogowano jako"
+      no_services: "You have not connected any services yet."
       really_disconnect: "rozłączyć %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kliknij w ten link, aby przyjąć zaproszenie"
@@ -625,8 +634,10 @@ pl:
     stream_element: 
       dislike: "Nie lubiÄ™ tego"
       like: "LubiÄ™ to"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Odwołaj \"Lubię to\""
       via: "z %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Pomyślnie wspomniano o: %{names}"
@@ -649,28 +660,34 @@ pl:
   stream_helper: 
     hide_comments: "ukryj komentarze"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nikt jeszcze nie rozmawia o %{tag}."
       people_tagged_with: "Osoby opisane poprzez %{tag}"
       posts_tagged_with: "Wpisy oznaczone jako #%{tag}"
-  the_world: "świat"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Połącz z Cubbi.es"
       connecting_is_simple: "Połączenie twojego konta na Diasporze jest proste: polega na wypełnieniu dwóch pól w twoim profilu Cubbi.es."
       daniels_account: "Konto Daniela na Diasporze"
-      generate_a_token: "Wygeneruj kod"
+      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."
       love_to_try: "Zapraszamy cię do wypróbowania!"
       making_the_connection: "Łączenie"
       screenshot_explanation: "%{link1}. Ten konkretny cubby jest połączony z %{link2}."
       sign_up_today: "Zarejestruj się już dziś!"
       typical_userpage: "Typowa strona użytkownika cubbi.es"
       via: "(z %{link})"
-      were_working_hard: "Ciężko pracujemy, aby umożliwić łatwe łączność konkretnych serwerów Diaspory z aplikacjami. Do czasu, kiedy zakończymy cały proces połączenie twojego konta na Diasporze z Cubbi.es oznacza skopiowanie i wklejenie zawartości dwóch pól."
       what_is_cubbies: "Cubbi.es jest pierwszą aplikacją Diaspory. To także najlepszy sposób na zebranie swoich zdjęć z sieci w jedno miejsce."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Cofnąć?"
   username: "Nazwa użytkownika"
   users: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index fd5aeebc0991b1e59967258f13ac2798557682c4..714bc860093f6a30cffc3caf69ea4dca6be41e95 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -106,6 +106,10 @@ pt-BR:
       no_contacts: "Nenhum contato"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ pt-BR:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ pt-BR:
       logout: "Sair"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ pt-BR:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "Mais"
   next: "Próximo"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ pt-BR:
     update: 
       failed: "Erro ao atualizar o perfil"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Cadastro temporariamente desabilitado."
     create: 
@@ -569,6 +577,7 @@ pt-BR:
       disconnect: "desvincular"
       edit_services: "Editar serviços"
       logged_in_as: "Entrou como"
+      no_services: "You have not connected any services yet."
       really_disconnect: "Desconectar %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Clique neste link para aceitar o convite"
@@ -625,8 +634,10 @@ pt-BR:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ pt-BR:
   stream_helper: 
     hide_comments: "Esconder comentários"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "O mundo"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Usuário"
   users: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 700f712509c6686b3e4138f7c5b91df4045a9127..7774d444931f9fa28c7e0b86e9b9ef557737e4b3 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -106,6 +106,10 @@ pt-PT:
       no_contacts: "Não há contactos"
       people_sharing_with_you: "Pessoas a partilhar consigo"
       post_a_message: "publicar uma mensagem >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspectos"
     move_contact: 
@@ -194,6 +198,7 @@ pt-PT:
       no_conversation_selected: "nenhuma conversa foi seleccionada"
       no_messages: "não há mensagens"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Enviar"
       subject: "assunto"
       to: "para"
@@ -267,6 +272,7 @@ pt-PT:
       logout: "Terminar sessão"
       profile: "perfil"
       settings: "definições"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ pt-PT:
         one: "%{count} pessoa gosta"
         other: "%{count} pessoas gostam"
         zero: "ninguém gosta"
+  limited: "Limited"
   more: "Mais"
   next: "próximo"
   no_results: "Não Foram Encontrados Resultados"
@@ -507,6 +514,7 @@ pt-PT:
     update: 
       failed: "Falhou ao actualizar o perfil"
       updated: "Perfil actualizado"
+  public: "Public"
   registrations: 
     closed: "Os registos estão encerrados neste pod do Diaspora."
     create: 
@@ -569,6 +577,7 @@ pt-PT:
       disconnect: "desligar"
       edit_services: "Editar serviços"
       logged_in_as: "com sessão registada como"
+      no_services: "You have not connected any services yet."
       really_disconnect: "desligar do %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Clique nesta ligação para aceitar o seu convite"
@@ -625,8 +634,10 @@ pt-PT:
     stream_element: 
       dislike: "Não gosto"
       like: "Gosto"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Não Gosto"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Mencionou com sucesso: %{names}"
@@ -649,28 +660,34 @@ pt-PT:
   stream_helper: 
     hide_comments: "ocultar comentários"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Ainda ninguém está a falar sobre %{tag}."
       people_tagged_with: "Pessoas com a %{tag}"
       posts_tagged_with: "Publicações com a tag #%{tag}"
-  the_world: "o mundo"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Ligar ao Cubbi.es"
       connecting_is_simple: "Ligar a sua conta do Diaspora é tão simples como preencher dois campos na página da sua conta do Cubbi.es."
       daniels_account: "conta do Diaspora do Daniel"
-      generate_a_token: "Gerar uma chave"
+      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."
       love_to_try: "Adoraríamos que o experimentasse."
       making_the_connection: "Fazer a Ligação"
       screenshot_explanation: "%{link1}.  Este cubby em particular está ligado à %{link2}."
       sign_up_today: "Registe-se hoje!"
       typical_userpage: "Uma típica página de utilizador do cubbi.es"
       via: "(via %{link})"
-      were_working_hard: "Estamos a trabalhar para conseguir conectividade fácil entre pods do Diaspora e aplicações.  Por enquanto, ligar a sua conta do Diaspora com o Cubbi.es implica copiar e colar dois campos."
       what_is_cubbies: "O Cubbi.es é a primeira aplicação Diaspora do mundo.  É também a melhor forma de coleccionar fotografias online."
-      your_diaspora_handle: "O Seu Endereço do Diaspora:"
-      your_diaspora_token: "A Sua Chave do Diaspora:"
   undo: "Anular?"
   username: "Nome de utilizador"
   users: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 6c34a0bd139f6dbe9800ec5e40cf3b3ed7ff6b6c..502471ef33a437d7b13ddb883fb5ff0155af10f6 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -106,6 +106,10 @@ ro:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ ro:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ ro:
       logout: "IeÅŸire"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ro:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "Mai mult"
   next: "următorul"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ ro:
     update: 
       failed: "Failed to update profile"
       updated: "Profil updatat"
+  public: "Public"
   registrations: 
     closed: "Signups are closed on this Diaspora pod."
     create: 
@@ -569,6 +577,7 @@ ro:
       disconnect: "desconectează"
       edit_services: "Edit services"
       logged_in_as: "conectat ca"
+      no_services: "You have not connected any services yet."
       really_disconnect: "desconectează %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click pe acest link pentru a accepta invitaţia"
@@ -625,8 +634,10 @@ ro:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ ro:
   stream_helper: 
     hide_comments: "ascunde comentariile"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "toată lumea"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Nume de utilizator"
   users: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 4054cfab400b546c23397897cddca36032d0ca1b..c990657f79380f8a66460443159d7f7df09e9764 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -106,6 +106,10 @@ ru:
       no_contacts: "Контакты отсутствуют"
       people_sharing_with_you: "Люди делятся с вами"
       post_a_message: "опубликовать сообщение>>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} аспект[-а, -ов]"
     move_contact: 
@@ -194,6 +198,7 @@ ru:
       no_conversation_selected: "разговор не выбран"
       no_messages: "нет сообщений"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Отправить"
       subject: "тема"
       to: "к"
@@ -267,6 +272,7 @@ ru:
       logout: "выйти"
       profile: "профиль"
       settings: "настройки"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ ru:
         one: "%{count} понравилось"
         other: "%{count} понравилось"
         zero: "никому не понравилось"
+  limited: "Limited"
   more: "Подробнее"
   next: "далее"
   no_results: "Результатов не найдено"
@@ -507,6 +514,7 @@ ru:
     update: 
       failed: "Не удалось обновить профиль"
       updated: "Профиль обновлен"
+  public: "Public"
   registrations: 
     closed: "В этой части Диаспоры регистрация закрыта"
     create: 
@@ -569,6 +577,7 @@ ru:
       disconnect: "разъединить"
       edit_services: "Редактировать сервисы"
       logged_in_as: "Вы вошли как"
+      no_services: "You have not connected any services yet."
       really_disconnect: "отключить %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Перейдите по этой ссылке для принятия вашего приглашения"
@@ -625,8 +634,10 @@ ru:
     stream_element: 
       dislike: "Не нравится"
       like: "Нравится"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "В отличие от"
       via: "через %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Успешно упомянут: %{names}"
@@ -649,28 +660,34 @@ ru:
   stream_helper: 
     hide_comments: "скрыть комментарии"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Никто пока не говорил о %{tag}."
       people_tagged_with: "Люди с меткой %{tag}"
       posts_tagged_with: "Сообщения с меткой #%{tag}"
-  the_world: "мир"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Подключение к Cubbi.es"
       connecting_is_simple: "Подключение диаспоры так же просто, как заполнить два поля на вашей странице Cubbi.es."
       daniels_account: "Диаспора-аккаунт Даниила"
-      generate_a_token: "Создание маркера"
+      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."
       love_to_try: "Мы будем рады, если вы попробуете это."
       making_the_connection: "Создание подключения"
       screenshot_explanation: "%{link1}.  Это особенно связано с %{link2}."
       sign_up_today: "Зарегистрируйтесь прямо сейчас!"
       typical_userpage: "Типичная cubbi.es страница"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es первая программа диаспоры. Это также лучший способ коллекции фотографий в Интернете."
-      your_diaspora_handle: "Ваша диаспора Ручка:"
-      your_diaspora_token: "Ваш диаспора Token:"
   undo: "Отменить?"
   username: "Имя пользователя"
   users: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index ef383ac7b8b817ec1909af1af4ab583b567d58bc..8652832f0a134b628cbbece09299b5dee53f7945 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -106,6 +106,10 @@ sk:
       no_contacts: "Žiadne kontakty"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ sk:
       no_conversation_selected: "no conversation selected"
       no_messages: "žiadne správy"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Poslať"
       subject: "predmet"
       to: "komu"
@@ -267,6 +272,7 @@ sk:
       logout: "odhlásiť sa"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ sk:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "Viac"
   next: "ďalej"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ sk:
     update: 
       failed: "Aktualizovanie profilu zlyhalo"
       updated: "Profil aktualizovaný"
+  public: "Public"
   registrations: 
     closed: "Registrácie sú zatvorené"
     create: 
@@ -569,6 +577,7 @@ sk:
       disconnect: "odpojiť"
       edit_services: "Upraviť služby"
       logged_in_as: "prihlásený ako"
+      no_services: "You have not connected any services yet."
       really_disconnect: "odpojiť %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Pre aktiváciu pozvania kliknite na tento link "
@@ -625,8 +634,10 @@ sk:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ sk:
   stream_helper: 
     hide_comments: "skyť komentáre"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "svet"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Užívateľské meno"
   users: 
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 8817ad2e1801def0919431315b8566bca7871e28..621d15726e435bca8c449af851ac82798a032ec7 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -106,6 +106,10 @@ sl:
       no_contacts: "Ni kontaktov"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ sl:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ sl:
       logout: "odjavi me"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ sl:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "Več"
   next: "naslednja"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ sl:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Za ta 'Diaspora pod' registracije trentno niso omogočene."
     create: 
@@ -569,6 +577,7 @@ sl:
       disconnect: "povezava prekinjena"
       edit_services: "Uredi servise"
       logged_in_as: "prijavljeni ste kot"
+      no_services: "You have not connected any services yet."
       really_disconnect: "prekinem povezavo s servisom %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Kliknite na povezavo za potrditev vašega povabila"
@@ -625,8 +634,10 @@ sl:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ sl:
   stream_helper: 
     hide_comments: "skrij komentarje"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "na splet"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Uporabniško ime"
   users: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index ba4a45a4bb338da1647dce2099c76a9c1c41dfd6..baee4013a2ded61233188df554a64d98c3945b23 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -106,6 +106,10 @@ sv:
       no_contacts: "Inga kontakter"
       people_sharing_with_you: "Personer som delar med dig"
       post_a_message: "skriv ett inlägg >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspekter"
     move_contact: 
@@ -194,6 +198,7 @@ sv:
       no_conversation_selected: "ingen konversation vald"
       no_messages: "inga meddelanden"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Skicka"
       subject: "ämne"
       to: "till"
@@ -267,6 +272,7 @@ sv:
       logout: "Logga ut"
       profile: "profil"
       settings: "Inställningar"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ sv:
         one: "1 person gillar det här"
         other: "%{count} personer gillar det här"
         zero: "inga personer gillar det här"
+  limited: "Limited"
   more: "Mer"
   next: "nästa"
   no_results: "Inga Resultat Funna"
@@ -507,6 +514,7 @@ sv:
     update: 
       failed: "Misslyckades att uppdatera profil"
       updated: "Profilen uppdaterades"
+  public: "Public"
   registrations: 
     closed: "Registreringsformuläret är stäng på den här poden."
     create: 
@@ -569,6 +577,7 @@ sv:
       disconnect: "koppla från"
       edit_services: "Anslutna tjänster"
       logged_in_as: "inloggad som"
+      no_services: "You have not connected any services yet."
       really_disconnect: "koppla från %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klicka på den här länken för att acceptera din inbjudan"
@@ -625,8 +634,10 @@ sv:
     stream_element: 
       dislike: "Jag ogillar det här"
       like: "Jag gillar det här"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Sluta gilla"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Lyckades omnämna: %{names}"
@@ -649,28 +660,34 @@ sv:
   stream_helper: 
     hide_comments: "dölj kommentarer"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Ingen talar om %{tag} än."
       people_tagged_with: "Personer taggade med %{tag}"
       posts_tagged_with: "Poster taggade med #%{tag}"
-  the_world: "världen"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Ã…ngra?"
   username: "Användarnamn"
   users: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index b0ffb2f8dcb43fbe9ca53befb316b4f990fa4ff1..c5ad5a81a2d07cef17511c2115524b6926aa7cd6 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -106,6 +106,10 @@ tr:
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -194,6 +198,7 @@ tr:
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "Send"
       subject: "subject"
       to: "to"
@@ -267,6 +272,7 @@ tr:
       logout: "Çıkış"
       profile: "profile"
       settings: "settings"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ tr:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
+  limited: "Limited"
   more: "More"
   next: "next"
   no_results: "No Results Found"
@@ -507,6 +514,7 @@ tr:
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
+  public: "Public"
   registrations: 
     closed: "Üyelik bu Diaspora'da kapandı."
     create: 
@@ -569,6 +577,7 @@ tr:
       disconnect: "çık"
       edit_services: "Edit services"
       logged_in_as: "olarak bağlandınız"
+      no_services: "You have not connected any services yet."
       really_disconnect: "disconnect %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
@@ -625,8 +634,10 @@ tr:
     stream_element: 
       dislike: "I dislike this"
       like: "I like this"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "Unlike"
       via: "via %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -649,28 +660,34 @@ tr:
   stream_helper: 
     hide_comments: "yorumları gizle"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "Nobody is talking about %{tag} yet."
       people_tagged_with: "People tagged with %{tag}"
       posts_tagged_with: "Posts tagged with #%{tag}"
-  the_world: "dünya"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "Undo?"
   username: "Kullanıcı Adı"
   users: 
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 71f6f1bab3c5485c086213b639f6d73ba57d4208..c047e861ecde4937d5224be5e8387339a453628b 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -106,6 +106,10 @@ zh-CN:
       no_contacts: "没有任何好友"
       people_sharing_with_you: "与您分享的人"
       post_a_message: "发布站内信>>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count}个视图"
     move_contact: 
@@ -194,6 +198,7 @@ zh-CN:
       no_conversation_selected: "未选择任何对话"
       no_messages: "没消息"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "发送"
       subject: "主题"
       to: "收件人"
@@ -267,6 +272,7 @@ zh-CN:
       logout: "登出"
       profile: "个人档案"
       settings: "设置"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ zh-CN:
         one: "有1个人觉得好"
         other: "有%{count}个人觉得好"
         zero: "没有人觉得好"
+  limited: "Limited"
   more: "更多"
   next: "下一步"
   no_results: "没有找到符合条件的内容"
@@ -507,6 +514,7 @@ zh-CN:
     update: 
       failed: "个人档案更新失败"
       updated: "个人档案更新成功"
+  public: "Public"
   registrations: 
     closed: "本 Diaspora pod 不开放注册。"
     create: 
@@ -569,6 +577,7 @@ zh-CN:
       disconnect: "断开连接"
       edit_services: "编辑服务"
       logged_in_as: "登录为"
+      no_services: "You have not connected any services yet."
       really_disconnect: "切断与 %{service} 的连接？"
     inviter: 
       click_link_to_accept_invitation: "点击这个链接以接受邀请"
@@ -625,8 +634,10 @@ zh-CN:
     stream_element: 
       dislike: "不喜欢"
       like: "喜欢"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "不喜欢"
       via: "通过 %{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "成功推荐了: %{names}"
@@ -649,28 +660,34 @@ zh-CN:
   stream_helper: 
     hide_comments: "隐藏评论"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "尚还没有人在讨论 %{tag}。"
       people_tagged_with: "标记为 %{tag} 的人"
       posts_tagged_with: "标记为 #%{tag} 的内容"
-  the_world: "全世界"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Connect to Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
       daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      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."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
       sign_up_today: "Sign up today!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
   undo: "撤消？"
   username: "帐号"
   users: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 11c8b29d4a7c744bf90e8402654b6e19a3e45966..41eb8c8cadd1bc94a5da48b08a7ee8bb183cd1b6 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -106,6 +106,10 @@ zh-TW:
       no_contacts: "沒有任何聯繫"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "發表訊息 >>"
+      services: 
+        content: "You can connect the following services to Diaspora:"
+        heading: "Connect Services"
+      tags_following: "Followed Tags"
       your_aspects: "Your Aspects"
     many: "%{count}個面向"
     move_contact: 
@@ -194,6 +198,7 @@ zh-TW:
       no_conversation_selected: "未選取任何對話"
       no_messages: "沒有訊息"
     new: 
+      abandon_changes: "Abandon changes?"
       send: "傳送"
       subject: "主旨"
       to: "收件人"
@@ -267,6 +272,7 @@ zh-TW:
       logout: "登出"
       profile: "個人檔案"
       settings: "設定"
+      view_all: "View all"
   likes: 
     likes: 
       people_dislike_this: 
@@ -281,6 +287,7 @@ zh-TW:
         one: "有%{count}個讚"
         other: "有%{count}個讚"
         zero: "沒有讚"
+  limited: "Limited"
   more: "更多"
   next: "後面"
   no_results: "搜尋沒有結果"
@@ -507,6 +514,7 @@ zh-TW:
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
+  public: "Public"
   registrations: 
     closed: "本 Diaspora pod 不開放登記."
     create: 
@@ -569,6 +577,7 @@ zh-TW:
       disconnect: "切斷連結"
       edit_services: "編輯服務"
       logged_in_as: "登入為"
+      no_services: "You have not connected any services yet."
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "按一下這個連結來接受邀請"
@@ -625,8 +634,10 @@ zh-TW:
     stream_element: 
       dislike: "遜"
       like: "讚"
+      shared_with: "Shared with: %{aspect_names}"
       unlike: "收回讚"
       via: "經由%{link}"
+      viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
     create: 
       success: "成功推薦了: %{names}"
@@ -649,28 +660,34 @@ zh-TW:
   stream_helper: 
     hide_comments: "隱藏意見"
     show_more_comments: "Show %{number} more comments"
+  tag_followings: 
+    create: 
+      failure: "Failed to follow: #%{name}"
+      success: "Successfully following: #%{name}"
+    destroy: 
+      failure: "Failed to stop following: #%{name}"
+      success: "Successfully stopped following: #%{name}"
   tags: 
     show: 
+      follow: "Follow #%{tag}"
+      following: "Following #%{tag}"
       nobody_talking: "尚還沒有人在討論 %{tag}."
       people_tagged_with: "標記為 %{tag} 的人"
       posts_tagged_with: "標記為 #%{tag} 的貼文"
-  the_world: "全世界"
+      stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "與 Cubbi.es 連結"
       connecting_is_simple: "只要在 Cubbi.es 的帳號設定中輸入兩個欄位, 就可以和你的 Diaspora 帳號建立連結了."
       daniels_account: "Daniel的 Diaspora 帳號"
-      generate_a_token: "產生token"
+      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."
       love_to_try: "希望你能試試看."
       making_the_connection: "建立連結"
       screenshot_explanation: "%{link1}. 這個cubby頁面是連結至%{link2}."
       sign_up_today: "今天就來註冊!"
       typical_userpage: "典型的 cubbi.es 個人頁面"
       via: "(經由%{link})"
-      were_working_hard: "我們正努力使 Diaspora pod 和應用程式能輕鬆連結. 在這段期間, 請用複製後貼上這兩個欄位來讓你的 Diaspora 帳號與 Cubbi.es 連結."
       what_is_cubbies: "Cubbi.es 是世界上第一個 Diaspora 應用程式. 它也是收集線上照片的最佳方式."
-      your_diaspora_handle: "Diaspora handle:"
-      your_diaspora_token: "Diaspora token:"
   undo: "復原?"
   username: "用戶名稱"
   users: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index b3643a45ab71c9bd7c9df1e5c51b996972c4325f..d4a7f05b73e2d01f3d6ffecc5f8d0913d785ae53 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -37,7 +37,7 @@ es:
       prefixAgo: "hace"
       prefixFromNow: "desde ahora"
       seconds: "menos de un minuto"
-      suffixAgo: "hace"
+      suffixAgo: ""
       suffixFromNow: "desde ahora"
       year: "un año aproximadamente"
       years: "%d años"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 281c87b8936465f111e287c8794ca16ee915f210..d4976fbc00ef0eb90871a09473dd5f966c3636a6 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -14,17 +14,17 @@ fi:
         other: "In {{count}} aspects"
         zero: "Add to aspect"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "piilota kommentit"
+      show: "näytä kaikki kommentit"
     confirm_dialog: "Oletko varma?"
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_like: "Tykkääminen epäonnistui!"
+    failed_to_post_message: "Viestin lähetys epäonnistui!"
     infinite_scroll: 
       no_more: "Ei enempää viestejä."
     publisher: 
       at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
     search_for: "Etsi nimellä {{name}}"
-    show_more: "show more"
+    show_more: "näytä lisää"
     timeago: 
       day: "päivä"
       days: "%d päivää"