updated 84 locale files [ci skip]

84 files changed, 2770 insertions, 2543 deletions

diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 29b2696f2..f365986fc 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -31,10 +31,10 @@ es:
       invitation_instructions: 
         accept: "Aceptar invitación"
         ignore: "Si no quieres aceptar la invitación, ignora este email."
-        no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace de arriba para registrarte."
+        no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace superior para registrarte."
         subject: "¡Has sido invitado a unirte a Diaspora*!"
       inviter: 
-        accept_at: "en %{url}, puedes aceptar en el enlace más abajo."
+        accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} te ha invitado a unirte a Diaspora*"
       reset_password_instructions: 
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index c1f5e1450..6b615d5b0 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -17,7 +17,7 @@ pt-PT:
       locked: "A sua conta foi bloqueada."
       timeout: "A sua sessão expirou, por favor inicie sessão novamente para continuar."
       unauthenticated: "É necessário iniciar sessão ou registar-se antes de continuar."
-      unconfirmed: "Precisa confirmar a sua conta antes de continuar."
+      unconfirmed: "Precisa de confirmar a sua conta antes de continuar."
     invitations: 
       invitation_token_invalid: "O código de convite que introduziu não é válido!"
       send_instructions: "O seu convite foi enviado."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 4058ee9a4..744a787bf 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -64,6 +64,9 @@ ar:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "رؤية عضو لآخر في هاته الفئة غير متاحة"
     contacts_visible: "رؤية عضو لآخر في هاته الفئة متاحة"
     create: 
@@ -89,7 +92,6 @@ ar:
       aspect_not_empty: "الفئة ليست فارغة"
       remove: "حذف"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es هو أول تطبيق تحت التطوير لديسبورا."
         heading: "صِل حسابك بـ Cubbi.es"
@@ -111,17 +113,17 @@ ar:
         need_help: "تحتاج للمساعدة؟"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "حافظ على %{pod} سريعا عبر تبرع شهري لصيانة السيرفرات "
       no_contacts: "لا أعضاء"
       no_tags: "+ جِـد وسما لمتابعته"
       people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "يمكنك وصل حساب ديسبورا الخاص بك بالخدمات الآتية:"
         heading: "صل حسابك بالخدمات"
       unfollow_tag: "أَوقِف متابعة #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "فئاتك"
     many: "%{count} فئات"
     move_contact: 
@@ -652,6 +654,8 @@ ar:
   search: "بحث"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "تمت المصادقة بنجاح"
     destroy: 
       success: "تم مسح المصادقة بنجاح"
@@ -711,15 +715,22 @@ ar:
     notification: 
       new: "%{type} جديد من %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "ولوج بـ %{service}"
       manage: "أَدِر الخدمات المتصلة"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "الرسائل العامة، متاحة للجميع حتى لمن هم خارج دياسبرا."
+      share: "Share"
       title: "اضبُط الخدمات المتصلة"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "الجميع"
       all_contacts: "جميع الفئات"
       discard_post: "تجاهل المشاركة"
       make_public: "عَمِّمْهَا"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "يَنشُر ..."
       publishing_to: "نشر إلى: "
@@ -730,6 +741,8 @@ ar:
     reshare: 
       reshare: "أَعِد النشر"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "لم يعجبني"
       hide_and_mute: "أخـفِ وأسكـتْ"
       like: "أعجبني"
@@ -763,7 +776,9 @@ ar:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ ar:
       edit_account: "تعديل الحساب"
       email_awaiting_confirmation: "لقد أرسلنا إليك رابط تفعيل إلى %{unconfirmed_email}. وحتى تتبع هذا الرابط وتفعل العنوان الجديد، سنستمر في استخدام بريدك الأساسي %{email}."
       export_data: "تصدير البيانات"
+      getting_started: "New User Prefrences"
       liked: "...أعجب أحدهم بمنشورك"
       mentioned: "...تم ذكرك في رسالة"
       new_password: "كلمة مرور جديدة"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...وصلتك راسلة خاصة"
       receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟"
       reshared: "...أعاد أحدهم نشر مشاركتك?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...بدأ أحدهم المشاركة معك؟"
       stream_preferences: "Stream Preferences"
       your_email: "بريدك الإلكتروني"
       your_handle: "وسيط ديسبورا الخاص بك"
     getting_started: 
-      bold: "فئات"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "إتصل بـ"
-      connect_to_your_other_social_networks: "إتصل بشبكات اجتماعية أخرى"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "إتصل بأحلى ناس"
-      connect_with_people_explanation_pt1: "إتصل مع الآخرين فقط بوضعهم في إحدى أو عديد %{bold}."
-      connect_with_people_explanation_pt2: "الفئات وسيلة ذكية لتصنيف مراسليك حسب رغبتك وخيارك وتمنحك امكانية المشاركة مع مجموعة من الأصدقاء دون أخرى."
-      edit_profile: "حرِّر الملف الشخصي"
-      featured_tags: "وسوم مميزة"
-      fill_out_your_profile: "إملأ بياناتك الشخصية"
-      find_friends: "جِـدْ أصدقائك"
-      find_friends_from_facebook: "جـِدْ أصدقائك بفايسبوك"
-      finished: "تم"
-      follow_your_interests: "تابع اهتماماتك"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "الوسوم تسمح لك بالحديث عن اهتماماتك ومتابعتها.  وهي أيضا طريقة عبقرية للعثور على أناس جدد بدياسبرا."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "سَـهِّل مهمة العثور عليك عبر ملأ بياناتك الشخصية."
-      profile_fields: 
-        bio: "سيرة ذاتية"
-        birthday: "تاريخ الميلاد"
-        gender: "الجنس"
-        location: "محل الإقامة"
-        name: "الإسم"
-        photo: "صورة"
-        tags: "وسوم"
-      search_for_hashtags: "إبحث عن #وسوم"
-      search_for_people: "إبحث عن أصدقاء"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "السلام عليكم ورحمة الله تعالى وبركاته"
-      welcome_with_name: "مرحبا، %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ ar:
     no_person_constructed: "هذا الـ hcard غير صالح."
     not_enabled: "webfinger غير مفعل للمضيف %{account}"
     xrd_fetch_failed: "خطأ خلال استرجاع xrd من الحساب %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 7ec36bf4f..b162d9960 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -64,6 +64,9 @@ bg:
       deselect_all: "Никой"
       edit_aspect: "Редактиране на \"%{name}\""
       select_all: "Всички"
+    aspect_stream: 
+      stay_updated: "Останете информирани"
+      stay_updated_explanation: "Вашият поток се състои от всичките ви контакти, марки (които следите) и публикации на изявени членове на общността."
     contacts_not_visible: "Контактите в аспекта няма да бъдат видими един за друг."
     contacts_visible: "Контактите в аспекта ще бъдат видими един за друг."
     create: 
@@ -89,7 +92,6 @@ bg:
       aspect_not_empty: "Аспектът не е празен"
       remove: "премахване"
     index: 
-      community_spotlight: "В центъра на вниманието"
       cubbies: 
         explanation: "Cubbi.es е първото приложение за Diaspora и все още се разработва."
         heading: "Свързване с Cubbi.es"
@@ -111,17 +113,17 @@ bg:
         need_help: "Нуждаетесе от помощ?"
         satisfaction: "%{link}: Поддръжка осигурена от общността"
         tutorials_and_wiki: "%{tutorial} и %{wiki}: ръководства, съвети и новини от общността"
+      introduce_yourself: "Това е вашият поток.  Включете се и се представете."
       keep_us_running: "Осигурете бързата работа на %{pod} като дарите пари за месечната издръжка на сървърите!"
       no_contacts: "Няма контакти"
       no_tags: "+ Намиране на марки"
       people_sharing_with_you: "Хора споделящи с вас"
       post_a_message: "публикуване на съобщение >>"
-      see_more_from_us: "Повече от общността на D*"
       services: 
         content: "Можете да свържете следните услуги към Diaspora:"
         heading: "Свързване към услуги"
       unfollow_tag: "Прекратяване следенето на #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Добре дошли в Diaspora, %{name}!"
       your_aspects: "Вашите аспекти"
     many: "%{count} аспекта"
     move_contact: 
@@ -132,8 +134,8 @@ bg:
       create: "Създаване"
       name: "Име (видимо е само за вас)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "в центъра на вниманието"
+      or_spotlight: "Или споделете с %{link}"
       try_adding_some_more_contacts: "Можете да търсите (в кутията отгоре) или да поканите хора (отдясно)."
       you_should_add_some_more_contacts: "Добавете няколко контакта!"
     no_posts_message: 
@@ -147,8 +149,8 @@ bg:
       work: "Работа"
     selected_contacts: 
       manage_your_aspects: "Управление на аспектите."
-      no_contacts: "Все още не сте добавили контакти."
-      view_all_community_spotlight: "See all community spotlight"
+      no_contacts: "Все още нямате контакти тук."
+      view_all_community_spotlight: "Вижте всички отличени потребители"
       view_all_contacts: "Показване на всички контакти"
     show: 
       edit_aspect: "редактиране на аспекта"
@@ -159,7 +161,7 @@ bg:
     zero: "няма аспекти"
   authorizations: 
     index: 
-      no_applications: "You haven't registered any applications yet."
+      no_applications: "Все още не сте регистрирали нито едно приложение."
       revoke_access: "Прекратяване на достъпа"
   back: "Назад"
   bookmarklet: 
@@ -237,7 +239,7 @@ bg:
     show: 
       delete: "изтриване и блокиране на разговора"
       reply: "отговор"
-      replying: "Replying..."
+      replying: "Изпращане на отговора..."
   date: 
     formats: 
       birthday: "%d %B"
@@ -377,12 +379,12 @@ bg:
       mark_all_as_read: "Маркиране на всички като прочетени"
       notifications: "Известия"
     liked: 
-      few: "Току-що %{actors} харесаха ваша %{post_link}."
-      many: "Току-що %{actors} харесаха ваша %{post_link}."
-      one: "Току-що %{actors} хареса ваша %{post_link}."
-      other: "Току-що  %{actors} харесаха ваша %{post_link}."
-      two: "Току-що %{actors} харесаха ваша %{post_link}."
-      zero: "Току-що %{actors} хареса ваша %{post_link}."
+      few: "%{actors} харесаха ваша %{post_link}."
+      many: "%{actors} харесаха ваша %{post_link}."
+      one: "%{actors} хареса ваша %{post_link}."
+      other: "%{actors} харесаха ваша %{post_link}."
+      two: "%{actors} харесаха ваша %{post_link}."
+      zero: "%{actors} хареса ваша %{post_link}."
     liked_post_deleted: 
       few: "%{actors} харесаха ваша изтрита публикация."
       many: "%{actors} харесаха ваша изтрита публикация."
@@ -395,7 +397,7 @@ bg:
       many: "%{actors} ви споменаха в %{post_link}."
       one: "%{actors} ви спомена в %{post_link}."
       other: "%{actors} ви спомена %{post_link}."
-      two: "%{actors}  ви споменаха в %{post_link}."
+      two: "%{actors} ви споменаха в %{post_link}."
       zero: "%{actors} ви спомена в %{post_link}."
     mentioned_deleted: 
       few: "%{actors} ви споменаха в изтрита публикация."
@@ -444,7 +446,7 @@ bg:
     email_sent_by_diaspora: "Ел. писмо е изпратено от Diaspora.  Ако вече не желаете да получавате подобни писма,"
     hello: "Здравейте %{name}!"
     liked: 
-      liked: "Току-що %{name} хареса вашата публикация"
+      liked: "%{name} хареса вашата публикация"
       view_post: "Преглед на публикацията >"
     mentioned: 
       mentioned: "ви спомена в публикация:"
@@ -452,7 +454,7 @@ bg:
     private_message: 
       reply_to_or_view: "Отговорете или прегледайте разговора >"
     reshared: 
-      reshared: "Току-що %{name} сподели ваша публикация"
+      reshared: "%{name} сподели ваша публикация"
       view_post: "Преглеждане >"
     single_admin: 
       admin: "Вашият администратор на Diaspora"
@@ -492,7 +494,7 @@ bg:
     profile_sidebar: 
       bio: "биографични данни"
       born: "рожден ден"
-      edit_my_profile: "Редактирайте профилът си"
+      edit_my_profile: "Редактирайте профила си"
       gender: "пол"
       in_aspects: "in aspects"
       location: "местоположение"
@@ -518,7 +520,7 @@ bg:
     two: "%{count} човека"
     webfinger: 
       fail: "За съжаление %{handle} не може да бъде намерен."
-    zero: "никой"
+    zero: "0 човека"
   photos: 
     comment_email_subject: "Снимка на %{name}"
     create: 
@@ -604,13 +606,13 @@ bg:
       unhappy: "Не сте доволни?"
       update: "Обновяване"
     new: 
-      create_my_account: "Създаване на акаунт"
+      create_my_account: "Създаване на акаунт!"
       enter_email: "Въведете ел. поща"
       enter_password: "Въведете парола"
       enter_password_again: "Въведете отново същата парола"
       enter_username: "Изберете си потребителско име (само букви, цифри и долна черта)"
       join_the_movement: "Присъединете се към движението!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "социалната мрежа със <3"
   requests: 
     create: 
       sending: "Изпращане"
@@ -652,6 +654,8 @@ bg:
   search: "Търсене"
   services: 
     create: 
+      already_authorized: "Потребител с адрес в Diaspora %{diaspora_id} вече е удостоверил акаунта %{service_name}."
+      failure: "Удостоверяването не бе успешно."
       success: "Удостоверяването приключи успешно."
     destroy: 
       success: "Удостоверението е изтрито успешно."
@@ -711,15 +715,22 @@ bg:
     notification: 
       new: "Ново %{type} от %{from}"
     public_explain: 
+      control_your_audience: "Определете публиката"
       logged_in: "вписани сте в %{service}"
       manage: "управление на свързаните услуги"
+      new_user_welcome_message: "Ползвайте диез марките (#име–на-марката), за да изясните/посочите темата на публикацийте си и за намиране на хора споделящи вашите интереси. Call out awesome people with @Mentions"
       outside: "Публичните съобщения ще са видими и за хора извън Diaspora."
+      share: "Споделете нещо"
       title: "Настройване на свързаните услуги"
+      visibility_dropdown: "Ползвайте падащото меню, за да промените видимостта на публикацията. (Препоръчително е да направите първата си публикация публична.)"
     publisher: 
       all: "всички"
       all_contacts: "всички контакти"
       discard_post: "Отхвърляне на публикацията"
       make_public: "направете публично"
+      new_user_prefill: 
+        hello: "Привет на всички, аз съм #%{new_user_tag}."
+        i_like: "Интересува ме %{tags}."
       post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
       posting: "Публикуване..."
       publishing_to: "публикуване в: "
@@ -730,6 +741,8 @@ bg:
     reshare: 
       reshare: "споделяне с"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Не ми харесва"
       hide_and_mute: "Скриване и прекратяване на известяването"
       like: "Харесва ми"
@@ -758,28 +771,30 @@ bg:
     show_more_comments: "Показване на още %{number} коментара"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Вашите аспекти"
+    aspects_stream: "Аспекти"
+    commented_on: "коментирани"
+    community_spotlight_stream: "В центъра на вниманието"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Хора, които харесват марките"
+      follow: "Follow"
+      title: "#Марки, които следите"
+    followed_tags_stream: "##Марки, които следите"
+    mentioned_stream: "@Кой ви спомена"
     mentions: 
       contacts_title: "Хора, които са ви споменали"
-      title: "Споменаване"
+      title: "@Кой ви е споменал"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Хора от аспектите ви"
+      title: "Поток"
+    posted: "публикувани"
     public: 
       contacts_title: "Скоро публикували"
       title: "Публична активност"
-    recently: "recently:"
+    recently: "наскоро:"
     tags: 
-      contacts_title: "Хора, които харесват тези марки"
+      contacts_title: "Хора, които харесват марката"
       title: "Публикации маркирани с \"%{tags}\""
   tag_followings: 
     create: 
@@ -791,7 +806,7 @@ bg:
   tags: 
     show: 
       follow: "Следете #%{tag}"
-      followed_by: "следи се от"
+      followed_by: "се следи от"
       following: "Следите #%{tag}"
       nobody_talking: "Никой не е говорил за %{tag}."
       people_tagged_with: "Хора маркирани с %{tag}"
@@ -831,52 +846,32 @@ bg:
       edit_account: "Редактиране на акаунта"
       email_awaiting_confirmation: "Изпратена е връзка за активиране до %{unconfirmed_email}. Докато не я активирате ще бъде ползвана старата ел. поща (%{email})."
       export_data: "Сваляне на..."
+      getting_started: "New User Prefrences"
       liked: "...някой хареса ваша публикация?"
       mentioned: "...бъдете споменат в публикация?"
       new_password: "Нова парола"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...получите лично съобщение?"
       receive_email_notifications: "Получаване на известие по ел. поща когато..."
       reshared: "...някой сподели ваша публикация?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Вклчюване на публикацийте от \"В центъра на вниманието\" в потока"
+      show_getting_started: "Реактивиране на въвеждащите съвети"
       started_sharing: "...някой започне да споделя с вас?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Предпочитания за потока"
       your_email: "Вашата ел. поща"
       your_handle: "Вашият адрес в Diaspora"
     getting_started: 
-      bold: "аспекти"
-      community_spotlight: "Community spotlight"
-      community_welcome: "Общността Diaspora с радост ви приветства в този pod!"
-      connect_to: "Свържете профила си с"
-      connect_to_your_other_social_networks: "Свържете профила си с други социални мрежи"
-      connect_to_your_other_social_networks_explanation_p1: "Свържете ли се към дадена услуга/сайт ще можете да публикувате и в тях."
-      connect_to_your_other_social_networks_explanation_p2: "Конкретно за Facebook можете да откриете приятелите си, които вече са се регистрирали в Diaspora и да поканите останалите."
-      connect_with_people: "Свържете се с интересни хора"
-      connect_with_people_explanation_pt1: "Свържете се с хора поставяйки ги в един или няколко от вашите %{bold}."
-      connect_with_people_explanation_pt2: "Групирането на контактите в аспекти ще ви позволи да споделяте/филтрирате информация само с/от определена подгрупа от контактите ви."
-      edit_profile: "Редактиране на профила"
-      featured_tags: "Следете избрани марки"
-      fill_out_your_profile: "Попълнете профила си"
-      find_friends: "Намерете приятели"
-      find_friends_from_facebook: "намерете приятелите си от Facebook"
-      finished: "Готово"
-      follow_your_interests: "Следете интересите си"
-      get_updates_from_core: "Нови относно проекта директно от екипа разработчици."
+      awesome_take_me_to_diaspora: "Към Diaspora*"
+      community_welcome: "Общността около Diaspora с радост ви приветства в този pod!"
       hashtag_explanation: "Диез марките (#име–на-марката) ви позволяват да коментирате и следите интересни за вас теми.  Улесняват и откриване на хора със сходни интереси в Diaspora."
-      not_mandatory: "Следващите стъпки не са задължителни, но изпълнението им ще подобри работата ви в Diaspora."
-      profile_description: "Улеснето хората, които ви търсят като попълните полетата на профила си."
-      profile_fields: 
-        bio: "Биографични данни"
-        birthday: "Дата на раждане"
-        gender: "Пол"
-        location: "Местоположение"
-        name: "Име"
-        photo: "Снимка"
-        tags: "Марки"
-      search_for_hashtags: "Търсене за #диез марки"
-      search_for_people: "Търсене за хора"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Добре дошли!"
-      welcome_with_name: "Здравейте, %{name}!"
+      hashtag_suggestions: "Пробвайте да следвате няколко марки като #art, #movies, #gif и др."
+      hooking_up_fb: "да свържете акаунта си от Facebook"
+      saved: "Записано!"
+      we_can_speed_things_up: "Ако желаете можете"
+      well_hello_there: "Здравейте!"
+      what_are_you_in_to: "От какво се интересувате?"
+      what_facebook_does: "с Diaspora. Така някои данни (име и снимка) ще бъдат попълнени автоматично и ще можете да публикувате съобщения във Facebook от Diaspora."
+      who_are_you: "Кой сте вие?"
     logged_out: 
       go_mobile: "Пробвайте и версията за мобилни устройства."
       on_your_mobile_device: "от вашето мобилно устройство за достъп до мобилната версия на Diaspora*."
@@ -886,13 +881,13 @@ bg:
     public: 
       does_not_exist: "Потребителят %{username} не съществува!"
     update: 
-      email_notifications_changed: "Адресът за известяване е променен"
+      email_notifications_changed: "Настройките за известяване бяха променени"
       language_changed: "Езикът е сменен"
       language_not_changed: "Езикът не бе сменен"
       password_changed: "Паролата е променена. Можете да се впишете с новата парола."
       password_not_changed: "Паролата не бе променена"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Настройките не бяха обновени"
+      settings_updated: "Настройките са обновени"
       unconfirmed_email_changed: "Ел. поща е променена. Необходимо е да я активирате."
       unconfirmed_email_not_changed: "Ел. поща не бе променена"
   webfinger: 
@@ -901,3 +896,4 @@ bg:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Привет от Diaspora,"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index dceba72dd..979402c34 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -64,6 +64,9 @@ br:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ br:
       aspect_not_empty: "Aspect not empty"
       remove: "skarzhañ"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ br:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Darempred ebet"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} arvez"
     move_contact: 
@@ -652,6 +654,8 @@ br:
   search: "Klask"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ br:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "You are about to post a public message!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "an holl"
       all_contacts: "an holl darempredoù"
       discard_post: "Discard post"
       make_public: "diskouez da'n holl"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Skrivañ ur c'hemennad da %{aspect}"
       posting: "Oc'h embann..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ br:
     reshare: 
       reshare: "Adkevrennañ"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Ne blij ket din"
       hide_and_mute: "Hide and Mute"
       like: "Plij' ra din"
@@ -763,7 +776,9 @@ br:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ br:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Ger-Kuzh Nevez"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notifications when..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Ho postel"
       your_handle: "Ho skor diaspora"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Echu!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Degemer mat e-barzh Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ br:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index cf55455ab..41bbd8fc3 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -64,6 +64,9 @@ cs:
       deselect_all: "Deselect all"
       edit_aspect: "Upravit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     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."
     create: 
@@ -89,7 +92,6 @@ cs:
       aspect_not_empty: "Aspekt není prázdný"
       remove: "odebrat"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es je první Diaspora aplikace ve vývoji."
         heading: "Připojit se na Cubbi.es"
@@ -111,17 +113,17 @@ cs:
         need_help: "Potřebujete pomoct?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Pomozte %{pod} udržet rychlý, kupte našim serverům dávku kávy."
       no_contacts: "Žádné kontakty"
       no_tags: "+ Najít nějaký štítek ke sledování"
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
       post_a_message: "odeslat příspěvek >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Můžete připojit následující služby na Diasporu:"
         heading: "Připojit služby"
       unfollow_tag: "Přestat sledovat #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Vaše aspekty"
     many: "%{count} aspektů"
     move_contact: 
@@ -652,6 +654,8 @@ cs:
   search: "Hledat"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Ověření úspěšné."
     destroy: 
       success: "Autorizace úspěšně odstraněna."
@@ -711,15 +715,22 @@ cs:
     notification: 
       new: "Nový %{type} od %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "přihlášen do %{service}"
       manage: "upravit připojené služby"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Veřejné příspěvky budou dostupné pro ostatní mimo Diasporu."
+      share: "Share"
       title: "Nastavit související služby"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "všechny"
       all_contacts: "všechny kontakty"
       discard_post: "Zahodit příspěvek"
       make_public: "vytvořit veřejnou"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
       publishing_to: "publikování na:"
@@ -730,6 +741,8 @@ cs:
     reshare: 
       reshare: "Sdílet jinam"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "to se mi nelíbí"
       hide_and_mute: "Hide and Mute"
       like: "to se mi líbí"
@@ -763,7 +776,9 @@ cs:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ cs:
       edit_account: "Upravit účet"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportovat data"
+      getting_started: "New User Prefrences"
       liked: "...někomu se líbí váš příspěvek?"
       mentioned: "...jste zmíněn v příspěvku?"
       new_password: "Nové heslo"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...obdržíte soukromou zprávu?"
       receive_email_notifications: "Přijímat oznámení e-mailem když..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...někdo začne sdílet s vámi?"
       stream_preferences: "Stream Preferences"
       your_email: "Váš e-mail"
       your_handle: "Vaše Diaspora ID"
     getting_started: 
-      bold: "aspektů"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Připojit ke"
-      connect_to_your_other_social_networks: "Připojit k dalším sociálním sítím"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Spojte se s lidmi"
-      connect_with_people_explanation_pt1: "Spojte se s lidmi jejich umístěním do jednoho nebo více z vašich %{bold}."
-      connect_with_people_explanation_pt2: "Apekty jsou snadný způsob, jak seskupovat nové a známé tváře. Dovolují jednoduše sdílet s podmnožinami vašich kontaktů."
-      edit_profile: "Upravit profil"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Vyplňte si svůj profil"
-      find_friends: "Najít přátele"
-      find_friends_from_facebook: "najít přátele z Facebooku"
-      finished: "Dokončeno"
-      follow_your_interests: "Sledujte, co vás zajímá"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Štítky vám dovolují sledovat, o co se zajímáte, a diskutovat. Je to také skvělý způsob, jak najít nové lidi na Diaspoře."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Zjednodušte ostatním vás najít vyplněním informací ve vašem profilu."
-      profile_fields: 
-        bio: "Něco o vás"
-        birthday: "Datum narození"
-        gender: "Pohlaví"
-        location: "Bydliště"
-        name: "Jméno"
-        photo: "Fotografie"
-        tags: "Štítky"
-      search_for_hashtags: "Vyhledat #štítky"
-      search_for_people: "Vyhledat lidi"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Vítejte!"
-      welcome_with_name: "Vítejte, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ cs:
     no_person_constructed: "Z této hcard nemůže být vytvořena žádná osoba."
     not_enabled: "Vypadá to, že webfinger nemůže být povolen pro hosta účtu %{account}"
     xrd_fetch_failed: "vyskytl se problém při získání xrd z účtu %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index fac1a3a34..b12483d48 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -64,6 +64,9 @@ cy:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ cy:
       aspect_not_empty: "Aspect not empty"
       remove: "remove"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ cy:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ cy:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully destroyed authentication."
@@ -711,15 +715,22 @@ cy:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "You are about to post a public message!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "all"
       all_contacts: "all contacts"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ cy:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ cy:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ cy:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finished!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome to Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ cy:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 71f99939e..166d1f91d 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -64,6 +64,9 @@ da:
       deselect_all: "Fravælg alle"
       edit_aspect: "Redigér %{navn}"
       select_all: "Vælg alle"
+    aspect_stream: 
+      stay_updated: "Hold dig opdateret"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontakter i dette aspekt vil ikke være i stand til at se hinanden."
     contacts_visible: "Kontakter i dette aspekt vil være i stand til at se hinanden."
     create: 
@@ -89,7 +92,6 @@ da:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "slet"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es er den første Diaspora applikation under udvikling."
         heading: "Tilslut til Cubbi.es"
@@ -111,17 +113,17 @@ da:
         need_help: "Brug for hjælp?"
         satisfaction: "%{link}: Samfunds-drevet support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Samfunds-drevne vejledninger, how-tos, og nyheder"
+      introduce_yourself: "Dette er din strøm. Hop ud i det og introducér dig selv."
       keep_us_running: "Hold %{pod} kørende hurtigt og køb serverne deres kaffe fix med en månedlig donation!"
       no_contacts: "Ingen kontakter"
       no_tags: "+ Find et tag for at følge"
       people_sharing_with_you: "Personer der deler med dig"
       post_a_message: "post en besked >>"
-      see_more_from_us: "Se mere af D* fællesskabet."
       services: 
         content: "Du kan tilslutte følgende tjenester til Diaspora:"
         heading: "Tilslut tjenester"
       unfollow_tag: "Hold op med at følge #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Velkommen til Diaspora %{name}!"
       your_aspects: "Dine aspekter"
     many: "%{count} aspekter"
     move_contact: 
@@ -133,7 +135,7 @@ da:
       name: "Navn (kun synligt for dig)"
     no_contacts_message: 
       community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      or_spotlight: "Eller du kan dele med %{link}"
       try_adding_some_more_contacts: "Du kan søge (øverst) eller invitere (til højre) flere kontakter."
       you_should_add_some_more_contacts: "Du bør tilføje nogle flere kontakter!"
     no_posts_message: 
@@ -394,9 +396,9 @@ da:
       few: "%{actors} har nævnt dig i et %{post_link}."
       many: "%{actors} har nævnt dig i et %{post_link}."
       one: "%{actors} har nævnt dig i et indlæg %{post_link}."
-      other: "%{actors} har nævnt dig i en besked %{post_link}."
+      other: "%{actors} har nævnt dig i et %{post_link}."
       two: "%{actors} har nævnt dig i %{post_link}."
-      zero: "%{actors} har nævnt dig i en %{post_link}."
+      zero: "%{actors} har nævnt dig i et %{post_link}."
     mentioned_deleted: 
       few: "%{actors} har nævnt dig i et slettet indlæg."
       many: "%{actors} har nævnt dig i et slettet indlæg."
@@ -610,7 +612,7 @@ da:
       enter_password_again: "Indtast den samme adgangskode som før"
       enter_username: "Vælg et brugernavn (kun bogstaver, tal og understreg)"
       join_the_movement: "Deltag i bevægelsen!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Socialt netværk med et <3"
   requests: 
     create: 
       sending: "Sender"
@@ -652,6 +654,8 @@ da:
   search: "Søg"
   services: 
     create: 
+      already_authorized: "En bruger med diaspora ID %{diaspora_id} har allerede godkendt den %{service_name} konto."
+      failure: "Godkendelse mislykkedes."
       success: "Godkendelse lykkedes."
     destroy: 
       success: "Godkendelsen er nu blevet slettet."
@@ -711,15 +715,22 @@ da:
     notification: 
       new: "Ny %{type} fra %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "Log ind til %{service}"
       manage: "Administrér tilsluttede tjenester"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Offentlige meddelelser vil være tilgængelige for andre uden for Diaspora."
+      share: "Del"
       title: "Opsæt tilsluttede tjenester"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "alle"
       all_contacts: "alle kontaktpersoner"
       discard_post: "Kassér indlæg"
       make_public: "offentliggør"
+      new_user_prefill: 
+        hello: "Hej allesammen, jeg er #%{new_user_tag}. "
+        i_like: "Jeg interesserer mig for %{tags}."
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
       publishing_to: "del med: "
@@ -730,8 +741,10 @@ da:
     reshare: 
       reshare: "Del igen"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Synes ikke om"
-      hide_and_mute: "Skjul og Dæmp"
+      hide_and_mute: "Skjul indlæg og kommentarer"
       like: "Synes om"
       shared_with: "Delt med: %{aspect_names}"
       unlike: "Synes ikke om"
@@ -758,26 +771,28 @@ da:
     show_more_comments: "Vis %{number} kommentarer mere"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
+      title: "Dine aspekter"
+    aspects_stream: "Aspekter"
+    commented_on: "kommenteret"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Personer der følger disse tags"
+      follow: "Follow"
+      title: "#Fulgte Tags"
+    followed_tags_stream: "#Fulgte Tags"
+    mentioned_stream: "@Omtaler"
     mentions: 
       contacts_title: "Personer der har nævnt dig"
       title: "Dine omtaler"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Personer i din Strøm"
+      title: "Strøm"
+    posted: "indsendt"
     public: 
       contacts_title: "Seneste indlæg"
       title: "Offentlig Aktivitet"
-    recently: "recently:"
+    recently: "for nylig:"
     tags: 
       contacts_title: "Folk der følger disse tags"
       title: "Indlæg tagget med: %{tags}"
@@ -831,52 +846,32 @@ da:
       edit_account: "Rediger konto"
       email_awaiting_confirmation: "Vi har sendt dig et aktiveringslink til %{unconfirmed_email}. Indtil du følger dette link og aktiverer den nye adresse, vil vi fortsætte med at bruge din oprindelige adresse %{email}."
       export_data: "Exportér data"
+      getting_started: "New User Prefrences"
       liked: "...nogen synes om dit indlæg?"
       mentioned: "...du er nævnt i et indlæg?"
       new_password: "Nyt adgangskode"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...du har modtaget en besked?"
       receive_email_notifications: "Modtag e-mail notifikation når..."
       reshared: "... nogen deler dit indlæg?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...nogen er begyndt at dele med dig?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Strøm opsætning"
       your_email: "Din e-mail"
       your_handle: "Dit Diaspora ID"
     getting_started: 
-      bold: "aspekter"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diasporas samfund er glad for at have dig ombord!"
-      connect_to: "Forbind til"
-      connect_to_your_other_social_networks: "Opret forbindelse til dine andre sociale netværk"
-      connect_to_your_other_social_networks_explanation_p1: "Tilslutning til tjenester vil give dig mulighed for at publicere ud til disse tjenester."
-      connect_to_your_other_social_networks_explanation_p2: "Med Facebook kan du også finde venner allerede på Diaspora og invitere andre."
-      connect_with_people: "Forbind med seje personer"
-      connect_with_people_explanation_pt1: "Forbind til personer ved at placere dem i en eller flere af dine %{bold}."
-      connect_with_people_explanation_pt2: "Aspekter er en intuitiv måde at gruppere nye og bekendte ansigter som er personlige for dig, så du kan filtrere eller dele med grupper af dine kontakter nemt."
-      edit_profile: "Redigér profil"
-      featured_tags: "Følg fremhævede tags"
-      fill_out_your_profile: "Udfyld din profil"
-      find_friends: "Find venner"
-      find_friends_from_facebook: "finde venner fra Facebook"
-      finished: "Færdig"
-      follow_your_interests: "Følg dine interesser"
-      get_updates_from_core: "Få opdateringer om projektet fra core holdet."
       hashtag_explanation: "Hashtags giver dig mulighed for at tale om og følge dine interesser. De er også en fantastisk måde at finde nye folk på diaspora."
-      not_mandatory: "Færdiggørelse af følgende trin vil forbedre din Diaspora oplevelse, men de er ikke obligatorisk."
-      profile_description: "Gør det lettere for folk at finde dig ved at udfylde din profil oplysninger."
-      profile_fields: 
-        bio: "Om"
-        birthday: "Fødselsdag"
-        gender: "Køn"
-        location: "Placering"
-        name: "Navn"
-        photo: "Billede"
-        tags: "Tags"
-      search_for_hashtags: "Søg efter #hashtags"
-      search_for_people: "Søg efter personer"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Velkommen!"
-      welcome_with_name: "Velkommen, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Gemt!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Bliv mobil nu."
       on_your_mobile_device: "på din mobile enhed til at få adgang til Diaspora* mobil."
@@ -891,8 +886,8 @@ da:
       language_not_changed: "Kunne ikke ændre sprog"
       password_changed: "Adgangskode ændret"
       password_not_changed: "Kunne ikke ændre adgangskode"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Der opstod en fejl ved opdatering af indstillinger"
+      settings_updated: "Indstillingerne blev opdateret"
       unconfirmed_email_changed: "E-mail ændret. Kræver aktivering."
       unconfirmed_email_not_changed: "E-mail ændring mislykkedes"
   webfinger: 
@@ -901,3 +896,4 @@ da:
     no_person_constructed: "Ingen person kunne konstrueres fra dette hcard."
     not_enabled: "det ser ikke ud til at webfinger er aktiveret på %{account}s domæne"
     xrd_fetch_failed: "der opstod en fejl i forbindelse med hentning af xrd fra kontoen %{account}"
+  welcome: "Velkommen!"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 5037e113e..c3a80fd09 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -64,6 +64,9 @@ de:
       deselect_all: "Auswahl aufheben"
       edit_aspect: "Bearbeite %{name}"
       select_all: "Alle auswählen"
+    aspect_stream: 
+      stay_updated: "Bleibe auf dem Laufenden"
+      stay_updated_explanation: "Dein Stream ist gefüllt mit all deinen Kontakten, Tags denen du folgst sowie Beiträgen einiger kreativer Mitglieder der Gemeinschaft."
     contacts_not_visible: "Kontakte in diesem Aspekt sind nicht in der Lage einander zu sehen."
     contacts_visible: "Kontakte in diesem Aspekt können sich untereinander sehen."
     create: 
@@ -89,7 +92,6 @@ de:
       aspect_not_empty: "Aspekt ist nicht leer"
       remove: "entfernen"
     index: 
-      community_spotlight: "Gemeinschaft Rampenlicht"
       cubbies: 
         explanation: "Cubbi.es ist die erste Diaspora Anwendung."
         heading: "Mit Cubbi.es verbinden"
@@ -102,26 +104,26 @@ de:
       handle_explanation: "Das ist deine Diaspora ID. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
       help: 
         do_you: "Hast du:"
-        email_feedback: "%{link} Ihr Feedback, wenn Sie es mögen"
-        feature_and_forum: "%{gs} & %{forum}: Gemeinschaft-Unterstützung und Sonderzugriffe"
+        email_feedback: "%{link} Dein Feedback für Diaspora"
+        feature_and_forum: "%{gs} & %{forum}: Unterstützung durch die Gemeinschaft und Sonderzugriffe"
         feature_suggestion: "… einen %{link} Vorschlag?"
         find_a_bug: "… einen %{link} gefunden?"
         have_a_question: "… eine %{link}?"
         here_to_help: "Die Diaspora-Community ist hier!"
         need_help: "Benötigst du Hilfe?"
-        satisfaction: "%{link}: Gemeinschaft-Unterstützung"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Gemeinschaft betriebene Tutorials, Anleitungen, und Nachrichten"
-      keep_us_running: "Hilf %{pod} schnell zu laufen und kaufe unseren Servern ihren monatlichen Schuss Kaffee!"
+        satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
+        tutorials_and_wiki: "%{tutorial} & %{wiki}: Von der Gemeinschaft erstellte Tutorials, Anleitungen, und Nachrichten"
+      introduce_yourself: "Das ist dein Stream. Leg' los und stell dich vor."
+      keep_us_running: "Hilf %{pod} schnell zu arbeiten und kaufe unseren Servern ihren monatlichen Schuss Kaffee!"
       no_contacts: "Keine Kontakte"
       no_tags: "+ Finde einen #Tag zum folgen"
       people_sharing_with_you: "Leute, die mit dir teilen"
       post_a_message: "Schreibe eine Nachricht >>"
-      see_more_from_us: "Mehr der D* Community zeigen."
       services: 
         content: "Du kannst die folgenden Dienste mit Diaspora verbinden:"
         heading: "Verbinde Dienste"
       unfollow_tag: "#%{tag} nicht mehr folgen"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Willkommen bei Diaspora, %{name}!"
       your_aspects: "Deine Aspekte"
     many: "%{count} Aspekte"
     move_contact: 
@@ -132,8 +134,8 @@ de:
       create: "Erstellen"
       name: "Name (nur für dich sichtbar)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "Gemeinschafts-Schaukasten"
+      or_spotlight: "Du kannst auch mit %{link} teilen"
       try_adding_some_more_contacts: "Du kannst nach Kontakten suchen (oben) oder welche einladen (rechts)."
       you_should_add_some_more_contacts: "Du solltest ein paar neue Kontakte hinzufügen!"
     no_posts_message: 
@@ -148,7 +150,7 @@ de:
     selected_contacts: 
       manage_your_aspects: "Verwalte deine Aspekte."
       no_contacts: "Du hast hier noch keine Kontakte."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Schaukasten der gesamten Gemeinschaft"
       view_all_contacts: "Zeige alle Kontakte"
     show: 
       edit_aspect: "Aspekt bearbeiten"
@@ -191,7 +193,7 @@ de:
       many_people_are_you_sure: "Bist du dir sicher, dass du eine private Unterhaltung mit mehr als %{suggested_limit} Kontakten beginnen möchtest? Einen Beitrag in diesen Aspekt zu schreiben könnte ein besserer Weg sein, um sie zu kontaktieren."
       my_contacts: "Meine Kontakte"
       no_contacts: "Sieht so aus als müsstest du einige Kontakte hinzufügen!"
-      only_sharing_with_me: "Nur mit mir Teilende"
+      only_sharing_with_me: "Nur mit dir Teilende"
       remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
       start_a_conversation: "Starte eine Unterhaltung"
       title: "Kontakte"
@@ -202,7 +204,7 @@ de:
     sharing: 
       people_sharing: "Leute, die mit dir teilen:"
     spotlight: 
-      community_spotlight: "Gemeinschaft Rampenlicht"
+      community_spotlight: "Gemeinschafts-Schaukasten"
     two: "%{count} Kontakte"
     zero: "Kontakte"
   conversations: 
@@ -305,7 +307,7 @@ de:
       login: "Anmelden"
       logout: "Abmelden"
       profile: "Profil"
-      recent_notifications: "Kürzliche Benachrichtigungen"
+      recent_notifications: "Letzte Benachrichtigungen"
       settings: "Einstellungen"
       view_all: "Alle anzeigen"
   likes: 
@@ -325,7 +327,7 @@ de:
         two: "%{count} Personen gefällt das"
         zero: "Keinem gefällt das"
       people_like_this_comment: 
-        few: "%{count} likes"
+        few: "Gefällt %{count}"
         many: "Gefällt %{count}"
         one: "Gefällt %{count}"
         other: "Gefällt %{count}"
@@ -344,12 +346,12 @@ de:
       two: "%{actors} haben auch %{post_author}s %{post_link} kommentiert."
       zero: "%{actors} hat auch %{post_author}s %{post_link} kommentiert."
     also_commented_deleted: 
-      few: "%{actors} haben einen gelöschten Beitrag kommentiert."
-      many: "%{actors} haben einen gelöschten Beitrag kommentiert."
-      one: "%{actors} hat einen gelöschten Beitrag kommentiert."
-      other: "%{actors} haben einen gelöschten Beitrag kommentiert."
-      two: "%{actors} haben deinen gelöschten Beitrag kommentiert."
-      zero: "Niemand hat einen gelöschten Beitrag kommentiert."
+      few: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
+      many: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
+      one: "%{actors} hat einen inzwischen gelöschten Beitrag kommentiert."
+      other: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
+      two: "%{actors} haben deinen inzwischen gelöschten Beitrag kommentiert."
+      zero: "Niemand hat einen inzwischen gelöschten Beitrag kommentiert."
     comment_on_post: 
       few: "%{actors} haben deinen %{post_link} kommentiert."
       many: "%{actors} haben deinen %{post_link} kommentiert."
@@ -373,7 +375,7 @@ de:
         one: "und einem anderen"
         other: "und %{count} anderen"
         two: "und %{count} andere"
-        zero: "und niemand anderen"
+        zero: "und niemand sonst"
       mark_all_as_read: "Markiere alle als gelesen"
       notifications: "Benachrichtigungen"
     liked: 
@@ -465,8 +467,8 @@ de:
     to_change_your_notification_settings: "um deine Benachrichtigungs-Einstellungen zu ändern"
   ok: "OK"
   or: "oder"
-  password: "Passwort"
-  password_confirmation: "Passwort-Bestätigung"
+  password: "Kennwort"
+  password_confirmation: "Kennwort-Bestätigung"
   people: 
     add_contact_small: 
       add_contact_from_tag: "Füge Kontakt über einen Hashtag hinzu"
@@ -560,7 +562,7 @@ de:
   posts: 
     show: 
       destroy: "Löschen"
-      not_found: "Sorry, wir konnten den Beitrag leider nicht finden."
+      not_found: "Entschuldige, wir konnten den Beitrag leider nicht finden."
       permalink: "Permanentlink"
   previous: "Vorherige"
   profile: "Profil"
@@ -588,10 +590,10 @@ de:
   reactions: 
     few: "%{count} Reaktionen"
     many: "%{count} Reaktionen"
-    one: "1 Reaktion"
+    one: "Eine Reaktion"
     other: "%{count} Reaktionen"
     two: "%{count} Reaktionen"
-    zero: "0 Reaktionen"
+    zero: "Keine Reaktionen"
   registrations: 
     closed: "Neuregistrierungen sind auf diesem Pod geschlossen."
     create: 
@@ -606,11 +608,11 @@ de:
     new: 
       create_my_account: "Konto erstellen"
       enter_email: "Gib eine E-Mail-Adresse an"
-      enter_password: "Gib ein Passwort ein"
-      enter_password_again: "Gib das gleiche Passwort wie zuvor ein"
+      enter_password: "Gib ein Kennwort ein"
+      enter_password_again: "Gib das gleiche Kennwort wie zuvor ein"
       enter_username: "Wähle einen Nutzernamen (nur Buchstaben, Nummern und Unterstriche)"
-      join_the_movement: "Trete der Bewegung bei!"
-      sign_up_message: "Social Networking with a <3"
+      join_the_movement: "Tritt der Bewegung bei!"
+      sign_up_message: "Soziales Netzwerken mit <3"
   requests: 
     create: 
       sending: "Senden …"
@@ -652,14 +654,16 @@ de:
   search: "Suche"
   services: 
     create: 
+      already_authorized: "Ein anderer Nutzer mit der Diaspora ID %{diaspora_id} hat diesen %{service_name}-Account bereits autorisiert."
+      failure: "Authentifizierung fehlgeschlagen."
       success: "Authentifizierung erfolgreich."
     destroy: 
       success: "Authentifizierung erfolgreich gelöscht."
     failure: 
-      error: "Es gab einen Fehler beim Verbinden mit dem Dienst."
+      error: "Es gab einen Fehler der Verbindung mit dem Dienst."
     finder: 
-      no_friends: "Keine Facebook Freunde gefunden."
-      service_friends: "%{service} Freunde"
+      no_friends: "Keine Facebook-Freunde gefunden."
+      service_friends: "%{service}-Freunde"
     index: 
       connect_to_facebook: "Mit Facebook verbinden"
       connect_to_tumblr: "Mit Tumblr verbinden"
@@ -682,7 +686,7 @@ de:
       add_new_contact: "Einen neuen Kontakt hinzufügen"
       create_request: "Finde mittels Diaspora ID"
       diaspora_handle: "diaspora@beispiel.org"
-      enter_a_diaspora_username: "Gib einen Diaspora Benutzernamen ein:"
+      enter_a_diaspora_username: "Gib einen Diaspora-Benutzernamen ein:"
       know_email: "Du kennst die E-Mail-Adresse? Sende eine Einladung!"
       your_diaspora_username_is: "Dein Diaspora Nutzername ist: %{diaspora_handle}"
     aspect_dropdown: 
@@ -701,25 +705,32 @@ de:
       your_aspects: "Deine Aspekte"
     invitations: 
       by_email: "Per E-Mail"
-      dont_have_now: "Du hast im Moment keine Einladungen zur Verfügung, aber es wird bald wieder neue geben!"
+      dont_have_now: "Du hast im Moment keine Einladungen zur Verfügung, es wird aber bald wieder neue geben!"
       from_facebook: "Von Facebook"
       invitations_left: "%{count} übrig"
       invite_someone: "Jemanden einladen"
       invite_your_friends: "Lade deine Freunde ein"
       invites: "Einladungen"
-      invites_closed: "Einladungen sind auf diesem Diaspora Pod derzeit nicht verfügbar."
+      invites_closed: "Einladungen sind auf diesem Diaspora-Pod derzeit nicht verfügbar."
     notification: 
       new: "Neue %{type} von %{from}"
     public_explain: 
+      control_your_audience: "Kontrolliere deine Zielgruppe"
       logged_in: "Eingeloggt in %{service}"
       manage: "Verbundene Dienste verwalten"
+      new_user_welcome_message: "Benutze #Hashtags um deine Beiträge einzuordnen und Leute zu finden, die deine Interessen teilen. Benenne tolle Leute mit @Mentions"
       outside: "Öffentliche Nachrichten werden für andere außerhalb von Diaspora sichtbar sein."
+      share: "Teilen"
       title: "Verbundene Dienste verwalten"
+      visibility_dropdown: "Benutze dieses Auswahlmenü um die Sichtbarkeit deines Betrags zu ändern.  (Wir empfehlen Dir den erst Öffentlich zu machen.)"
     publisher: 
       all: "alle"
       all_contacts: "Alle Kontakte"
       discard_post: "Beitrag verwerfen"
       make_public: "veröffentlichen"
+      new_user_prefill: 
+        hello: "Hallo zusammen, ich bin #%{new_user_tag}. "
+        i_like: "Ich interessiere mich für %{tags}."
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
       publishing_to: "Veröffentlichen an: "
@@ -730,6 +741,8 @@ de:
     reshare: 
       reshare: "Weitersagen"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Gefällt mir nicht"
       hide_and_mute: "Verbergen und stummschalten"
       like: "Gefällt mir"
@@ -758,26 +771,28 @@ de:
     show_more_comments: "Zeige %{number} weitere Kommentare"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Deine Aspekte"
+    aspects_stream: "Aspekte"
+    commented_on: "kommentiert"
+    community_spotlight_stream: "Gemeinschafts-Schaukasten"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Leute, denen diese Tags gefallen"
+      follow: "Follow"
+      title: "#Gefolgte Tags"
+    followed_tags_stream: "#Gefolgte Tags"
+    mentioned_stream: "@Erwähnungen"
     mentions: 
       contacts_title: "Personen, die dich erwähnt haben"
       title: "Deine Erwähnungen"
     multi: 
-      contacts_title: "People in your Stream"
+      contacts_title: "Personen in deinem Stream"
       title: "Stream"
-    posted: "posted"
+    posted: "veröffentlicht"
     public: 
       contacts_title: "Aktuelle Poster"
       title: "Öffentliche Aktivität"
-    recently: "recently:"
+    recently: "zuletzt:"
     tags: 
       contacts_title: "Menschen, die diese Tags nutzen"
       title: "Getaggte Beiträge: %{tags}"
@@ -793,7 +808,7 @@ de:
       follow: "#%{tag} folgen"
       followed_by: "gefolgt von"
       following: "#%{tag} folgen"
-      nobody_talking: "Niemand hat schon etwas über %{tag} gesagt."
+      nobody_talking: "Niemand hat bisher etwas über %{tag} gesagt."
       people_tagged_with: "Personen, die mit %{tag} getagt sind"
       posts_tagged_with: "Beiträge, die mit #%{tag} getagt sind"
       stop_following: "#%{tag} nicht mehr folgen"
@@ -825,61 +840,41 @@ de:
       change_password: "Passwort ändern"
       close_account: "Konto schließen"
       comment_on_post: "… jemand deinen Beitrag kommentiert?"
-      current_password: "Derzeitiges Passwort"
+      current_password: "Derzeitiges Kennwort"
       download_photos: "Meine Fotos herunterladen"
       download_xml: "Daten herunterladen (XML)"
       edit_account: "Konto bearbeiten"
       email_awaiting_confirmation: "Wir haben dir einen Aktivierungslink zu %{unconfirmed_email} geschickt. Solange du dem Link nicht gefolgt bist und die neue Adresse aktiviert hast, werden wir weiterhin deine ursprüngliche E-Mail-Adresse %{email} verwenden."
       export_data: "Daten exportieren"
-      liked: "... wenn jemandem dein Beitrag gefällt?"
+      getting_started: "Einstellungen für neue Nutzer"
+      liked: "… wenn jemandem dein Beitrag gefällt?"
       mentioned: "… du in einem Beitrag erwähnt wirst?"
-      new_password: "Neues Passwort"
+      new_password: "Neues Kennwort"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "… du eine private Nachricht erhältst?"
       receive_email_notifications: "E-Mail-Benachrichtigungen empfangen, wenn …"
       reshared: "… jemand deinen Beitrag weitersagt?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen?"
+      show_getting_started: "Einstieg reaktivieren"
       started_sharing: "… jemand mit dir zu teilen anfängt?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Stream-Einstellungen"
       your_email: "Deine E-Mail-Adresse"
       your_handle: "Deine Diaspora ID"
     getting_started: 
-      bold: "Aspekten"
-      community_spotlight: "Community spotlight"
-      community_welcome: "Diaspora's Community ist froh Dich an Bord zu haben!"
-      connect_to: "Verbinde dich mit"
-      connect_to_your_other_social_networks: "Verbinde dich mit deinen anderen sozialen Netzwerken"
-      connect_to_your_other_social_networks_explanation_p1: "Verbindungen zu Diensten erlaubt dir in dort auch zu veröffentlichen."
-      connect_to_your_other_social_networks_explanation_p2: "Mit Facebook kannst du Freunde finden, die bereits bei Diaspora sind, und andere einladen."
-      connect_with_people: "Kontaktiere tolle Leute"
-      connect_with_people_explanation_pt1: "Verbinde dich mit Leuten, indem du sie in einen oder mehreren deiner %{bold} platzierst."
-      connect_with_people_explanation_pt2: "Aspekte sind ein intuitiver Weg, um neue und bekannte Gesichter für dich allein zu gruppieren. Diese erlauben es dir, einfach Teile deiner Kontakte zu filtern oder mit ihnen Beiträge zu teilen."
-      edit_profile: "Profil bearbeiten"
-      featured_tags: "Folge empfohlenen Tags"
-      fill_out_your_profile: "Fülle dein Profil aus"
-      find_friends: "Finde Freunde"
-      find_friends_from_facebook: "Finde Freunde von Facebook"
-      finished: "Fertig"
-      follow_your_interests: "Folge deinen Interessen"
-      get_updates_from_core: "Erhalte Neuigkeiten über das Projekt vom Kernteam."
+      awesome_take_me_to_diaspora: "Super! Bring mich zu Diaspora*"
+      community_welcome: "Diasporas Gemeinschaft ist froh, dich an Bord zu haben!"
       hashtag_explanation: "Hashtags ermöglichen dir, über deine Interessen zu reden und ihnen zu folgen. Sie sind auch ein guter Weg, neue Leute bei Diaspora zu treffen!"
-      not_mandatory: "Die folgenden Schritte zu vervollständigen wird dein Erlebnis mit Diaspora verbessern, aber sie sind nicht verpflichtend."
-      profile_description: "Mach es anderen Leuten leichter, dich zu finden, indem du dein Profil ausfüllst."
-      profile_fields: 
-        bio: "Beschreibung"
-        birthday: "Geburtstag"
-        gender: "Geschlecht"
-        location: "Ort"
-        name: "Name"
-        photo: "Foto"
-        tags: "Tags"
-      search_for_hashtags: "Suche nach #Hashtags"
-      search_for_people: "Suche nach Leuten"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Herzlich willkommen!"
-      welcome_with_name: "Herzlich willkommen, %{name}!"
+      hashtag_suggestions: "Probier mal Tags wie #kunst, #musik oder #gif zu folgen."
+      hooking_up_fb: "du deinen Facebook-Account"
+      saved: "Gespeichert!"
+      we_can_speed_things_up: "Wir können die Dinge ein wenig beschleunigen wenn"
+      well_hello_there: "Also, Hallöchen!"
+      what_are_you_in_to: "Was machst du so?"
+      what_facebook_does: "mit Diaspora verbindest. Hierbei wird dein Name und dein Foto geladen, und das Veröffentlichen zu Facebook ermöglicht."
+      who_are_you: "Wer bist Du?"
     logged_out: 
       go_mobile: "Jetzt mobil werden."
-      on_your_mobile_device: "auf deinem mobilem Gerät um die mobile Seite von Diaspora* zu benutzen."
+      on_your_mobile_device: "auf deinem mobilem Gerät, um die mobile Seite von Diaspora* zu benutzen."
       signed_out: "Du hast dich aus Diaspora* ausgeloggt"
       simply_visit: "Besuche einfach"
       works_on_modern: "Funktioniert auf allen modernen Smartphones"
@@ -889,15 +884,16 @@ de:
       email_notifications_changed: "E-Mail-Benachrichtigungen geändert"
       language_changed: "Sprache geändert"
       language_not_changed: "Fehler beim Ändern der Sprache."
-      password_changed: "Passwort geändert. Du kannst dich nun mit deinem neuen Passwort anmelden."
-      password_not_changed: "Fehler beim Ändern des Passworts."
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
-      unconfirmed_email_changed: "E-Mail-Adresse geändert. Braucht Aktivierung."
-      unconfirmed_email_not_changed: "Fehler bei E-Mail-Adressen-Änderung"
+      password_changed: "Kennwort geändert. Du kannst dich nun mit deinem neuen Kennwort anmelden."
+      password_not_changed: "Fehler beim Ändern des Kennwort."
+      settings_not_updated: "Aktualisierung der Einstellungen fehlgeschlagen"
+      settings_updated: "Einstellungen aktualisiert"
+      unconfirmed_email_changed: "E-Mail-Adresse geändert. Benötigt Aktivierung."
+      unconfirmed_email_not_changed: "Fehler bei Änderung der E-Mail-Adresse"
   webfinger: 
     fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden"
     hcard_fetch_failed: "es gab Probleme beim Laden der hcard für %{account}"
     no_person_constructed: "Konnte keine Person aus dieser hcard erstellen."
     not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
     xrd_fetch_failed: "Die XRD-Datei von %{account} konnte nicht heruntergeladen werden."
+  welcome: "Willkommen!"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 801a34738..fe180eaae 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -64,6 +64,9 @@ el:
       deselect_all: "Deselect all"
       edit_aspect: "Επεξεργασία %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Μείνετε ενημερωμένος/η"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Οι επαφές σ' αυτήν την πτυχή δεν θα μπορούν να δουν ο ένας τον άλλον."
     contacts_visible: "Οι επαφές σ' αυτήν την πτυχή θα μπορούν να δουν ο ένας τον άλλον."
     create: 
@@ -89,7 +92,6 @@ el:
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
       remove: "αφαίρεση"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Το Cubbi.es είναι η πρώτη εφαρμογή του Diaspora υπό κατασκευή."
         heading: "Συνδεθείτε στο Cubbi.es"
@@ -111,17 +113,17 @@ el:
         need_help: "Χρειάζεστε βοήθεια;"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "Αυτή είναι η Ροή σας. Μπείτε και συστηθείτε."
       keep_us_running: "Διατηρείστε τη καλή λειτουργία του %{pod}, παρέχοντας στους servers μας τη καφείνη τους!"
       no_contacts: "Καμία επαφή"
       no_tags: "+ Βρείτε μια ετικέτα να ακολουθείτε"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
       post_a_message: "δημοσιεύστε ένα μήνυμα >>"
-      see_more_from_us: "Δείτε περισσότερα από τη κοινότητα D*."
       services: 
         content: "Μπορείτε να συνδέσετε τις παρακάτω υπηρεσίες στο Diaspora:"
         heading: "Συνδέστε Υπηρεσίες"
       unfollow_tag: "Σταματήστε να ακολουθείτε την ετικέτα #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Καλωσήρθες στο Diaspora, %{name}!"
       your_aspects: "Οι Πτυχές σας"
     many: "%{count} πτυχές"
     move_contact: 
@@ -652,6 +654,8 @@ el:
   search: "Αναζήτηση"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Επιτυχής έλεγχος ταυτότητας."
     destroy: 
       success: "Επιτυχής καταστροφή ταυτότητας."
@@ -711,15 +715,22 @@ el:
     notification: 
       new: "Νέο %{type} από τον χρήστη %{from}"
     public_explain: 
+      control_your_audience: "Ελέγξτε το Κοινό σας"
       logged_in: "συνδεδεμένος/η στο %{service}"
       manage: "διαχείριση συναφών υπηρεσιών"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Τα δημόσια μηνύματα θα είναι διαθέσιμα και σε χρήστες εκτός του δικτύου Diaspora"
+      share: "Μοιραστείτε"
       title: "Ρύθμιση συνδεδεμένων υπηρεσιών"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "όλα"
       all_contacts: "όλες οι επαφές"
       discard_post: "Απομάκρυνση δημοσίευσης"
       make_public: "Δημοσιοποίησε το"
+      new_user_prefill: 
+        hello: "Γεια σε όλους, είμαι #%{new_user_tag}. "
+        i_like: "Με ενδιαφέρουν οι ετικέτες %{tags}."
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
       publishing_to: "δημοσίευση στο: "
@@ -730,6 +741,8 @@ el:
     reshare: 
       reshare: "Μοιράσου και πάλι"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Δεν μ' αρέσει"
       hide_and_mute: "Απόκρυψη και Σίγαση "
       like: "Μου αρέσει"
@@ -759,11 +772,13 @@ el:
   streams: 
     aspects: 
       title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
+    aspects_stream: "Πτυχές"
+    commented_on: "σχολιάστηκε"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -771,8 +786,8 @@ el:
       contacts_title: "Άτομα που σας έχουν αναφέρει"
       title: "Οι Αναφορές σας"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
+      contacts_title: "Άτομα στη Ροή σας"
+      title: "Ροή"
     posted: "posted"
     public: 
       contacts_title: "Πρόσφατες Αφίσες"
@@ -831,52 +846,32 @@ el:
       edit_account: "Επεξεργασία λογαριασμού"
       email_awaiting_confirmation: "Σας στείλαμε έναν σύνδεσμο ενεργοποίησης στο %{unconfirmed_email}. Μέχρι να ακολουθήσετε αυτόν τον σύνδεσμο και να ενεργοποιήσετε τη νέα διεύθυνση, θα συνεχίσουμε να χρησιμοποιούμε την αρχική σας %{email}."
       export_data: "Εξαγωγή Δεδομένων"
+      getting_started: "New User Prefrences"
       liked: "...σε κάποιον αρέσει η δημοσίευση σας;"
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
       new_password: "Νέος κωδικός πρόσβασης"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?"
       receive_email_notifications: "Να λαμβάνετε ειδοποιήσεις στο ηλεκτρονικό σας ταχυδρομείο όταν..."
       reshared: "...κάποιος κοινοποίησε τη δημοσίευση σας?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...κάποιος άρχισε να διαμοιράζεται μαζί σας?"
       stream_preferences: "Stream Preferences"
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started: 
-      bold: "πτυχές"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Η κοινότητα του Diaspora είναι χαρούμενη να σας έχει μαζί!"
-      connect_to: "Συνδεθείτε με"
-      connect_to_your_other_social_networks: "Συνδεθείτε με άλλα κοινωνικά δίκτυα"
-      connect_to_your_other_social_networks_explanation_p1: "Η σύνδεση σε άλλες υπηρεσίες σας δίνει τη δυνατότητα να δημοσιοποιήσετε σε αυτές τις υπηρεσίες."
-      connect_to_your_other_social_networks_explanation_p2: "Μέσω του Facebook, θα μπορέσετε να βρείτε φίλους που χρησιμοποιούν ήδη το Diaspora και να προσκαλέσετε και άλλους."
-      connect_with_people: "Συνδεθείτε με ενδιαφέροντα άτομα"
-      connect_with_people_explanation_pt1: "Συνδεθείτε με άτομα τοποθετώντας τα σε μία ή περισσότερες από τις %{bold}"
-      connect_with_people_explanation_pt2: "Οι Πτυχές είναι ενας τρόπος οργάνωσης, των προσωπικών σου, καινούργιων και γνωστών σου προσώπων, επιτρέποντας σου να διαχωρίσεις η να μοιραστέις με υποκατηγοριές των επαφών σου πιο εύκολα."
-      edit_profile: "Επεξεργασία Προφίλ"
-      featured_tags: "Ακολουθείστε αξιόλογες ετικέτες"
-      fill_out_your_profile: "Συμπληρώστε το προφίλ σας "
-      find_friends: "Βρείτε φίλους"
-      find_friends_from_facebook: "βρείτε φίλους από το Facebook"
-      finished: "Τέλος!"
-      follow_your_interests: "Ακολουθείστε τα ενδιαφέροντα σας"
-      get_updates_from_core: "Λάβετε ενημερώσεις σχετικά με το σχέδιο από την κεντρική ομάδα."
       hashtag_explanation: "Τα hashtags σας επιτρέπουν να συζητάτε και να ακολουθείτε συγκεκριμένα ενδιαφέροντα. Είναι ακόμα ένας ωραίος τρόπος για να γνωρίσετε νέα άτομα στο Diaspora."
-      not_mandatory: "Ακολουθώντας τα επόμενα βήματα θα εξοικειωθείτε περισσότερο με το Diaspora, χωρίς να είναι βέβαια υποχρεωτικά."
-      profile_description: "Διευκολύνετε άλλους χρήστες να σας βρουν συμπληρώνοντας τις προσωπικές σας πληροφορίες."
-      profile_fields: 
-        bio: "Βιογραφικό"
-        birthday: "Γενέθλια"
-        gender: "Φύλο"
-        location: "Τοποθεσία"
-        name: "Όνομα"
-        photo: "Φωτογραφία"
-        tags: "Ετικέτες"
-      search_for_hashtags: "Αναζήτηση για #ετικέτες"
-      search_for_people: "Ψάξτε άτομα"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Καλώς ήλθατε!"
-      welcome_with_name: "Καλώς ήρθες, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Εναλλαγή σε κινητό."
       on_your_mobile_device: "στη κινητή συσκευή σας για να έχετε πρόσβαση στη κινητή έκδοση του Diaspora*."
@@ -891,8 +886,8 @@ el:
       language_not_changed: "Η αλλαγή γλώσσας απέτυχε"
       password_changed: "Ο κωδικός σας άλλαξε. Μπορείτε τώρα να συνδεθείτε με τον νέο κωδικό. "
       password_not_changed: "Η αλλαγή κωδικού απέτυχε"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Αποτυχία ενημέρωσης ρυθμίσεων"
+      settings_updated: "Οι ρυθμίσεις ενημερώθηκαν"
       unconfirmed_email_changed: "Η διεύθυνση ηλεκτρονικού ταχυδρομείου άλλαξε. Χρειάζεται ενεργοποίηση."
       unconfirmed_email_not_changed: "Η αλλαγή της διεύθυνσης ηλεκτρονικού ταχυδρομείου απέτυχε."
   webfinger: 
@@ -901,3 +896,4 @@ el:
     no_person_constructed: "Κανένα άτομο δεν μπορούσε να κατασκευαστεί απο αυτό το hcard."
     not_enabled: "το webfinger φαίνεται να μην είναι ενεργοποιημέο για τον host του %{account}"
     xrd_fetch_failed: "υπήρξε ένα πρόβλημα στη λήψη του xrd απο το λογαριασμό %{account}"
+  welcome: "Καλωσήρθατε!"
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index b60a10954..7b7c24306 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -64,6 +64,9 @@ en_1337:
       deselect_all: "Deselect all"
       edit_aspect: "3D17 %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "N00B5 1N 7H15 45P3C7 W0N7 KN0W 34CH 07H3R!"
     contacts_visible: "N00B5 1N 7H15 45P3C7 W1LL KN0W 34CH 07H3R!"
     create: 
@@ -89,7 +92,6 @@ en_1337:
       aspect_not_empty: "45P3C7 N07 3MP7Y!"
       remove: "R3M0V3"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "CUBB1.35 15 7H3 F1R57 4PP F0R D*!"
         heading: "C0NN3C7 70 CUBB1.35"
@@ -111,17 +113,17 @@ en_1337:
         need_help: "N33D H3LP?"
         satisfaction: "%{link}: C0MMUN17Y-P0W3R3D 5UPP0R7!"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: 7U70R14L5, H0W705, N3W5, 37C..."
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "K33P %{pod} UP BY D0N471NG 3V3RY M0N7H!"
       no_contacts: "N0 N00B5"
       no_tags: "+ F1ND 4 #74G 2 F0LL0W"
       people_sharing_with_you: "N00B5 5H4R1NG W17H U!"
       post_a_message: "5P4M 50M37H1NG >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "U C4N C0NN3C7 7H3 F0LL0W1NG 53RV1C35 2 D*:"
         heading: "C0NN3C7 53RV1C35"
       unfollow_tag: "570P F0LL0W1NG #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Y0UR 45P3C75"
     many: "%{count} 45P3C75"
     move_contact: 
@@ -652,6 +654,8 @@ en_1337:
   search: "534RCH"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "4U7H3N71F1C4710N 5UCC355FULL"
     destroy: 
       success: "5UCC35FULLY D3L373D 4U7H3N71F1C4710N!"
@@ -711,15 +715,22 @@ en_1337:
     notification: 
       new: "N3W %{type} FR0M %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "L0GG3D 1N 2 %{service}"
       manage: "M4N4G3 C0NN3C73D 53RV1C35"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "PUBL1C 5P4M5 W1LL B3 4V14BL3 2 07H3R5 0U751D3 0F D* 2 533!"
+      share: "Share"
       title: "537 UP C0NN3C73D 53RV1C35"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "4LL"
       all_contacts: "4LL N00B5"
       discard_post: "D15C4RD P057"
       make_public: "M4K3 PUBL1C"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "5P4M 7H15 45P3C7: %{aspect}"
       posting: "5P4MM1NG..."
       publishing_to: "PUBL15H1NG 2: "
@@ -730,6 +741,8 @@ en_1337:
     reshare: 
       reshare: "R35P4M"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "PWN"
       hide_and_mute: "H1D3 4ND PWN"
       like: "<3"
@@ -763,7 +776,9 @@ en_1337:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ en_1337:
       edit_account: "H4CK Y0UR 4CC0UN7"
       email_awaiting_confirmation: "4C71V4510N L1NK 53N7 2 %{unconfirmed_email}. UN71L U F0LL0W 7H3 L1NK W3 W1LL C0N71NU3 2 U53 Y0UR 0R1G1N4L M41L %{email}."
       export_data: "3XP0R7 D474"
+      getting_started: "New User Prefrences"
       liked: "...50M30N3 L1K35 Y0UR 5P4M?"
       mentioned: "...U 4R3 M3N710N3D 1N 4 5P4M?"
       new_password: "N3W *****"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...U R3C13V3 4 PN?"
       receive_email_notifications: "R3C13V3 5P4M WH3N..."
       reshared: "...50M30N3 R35H4R35 Y0UR 5P4M?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...50M30N3 574R75 5H4R1NG W17H U?"
       stream_preferences: "Stream Preferences"
       your_email: "Y0UR M41L"
       your_handle: "Y0UR D* 1D"
     getting_started: 
-      bold: "45P3C75"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "7H3 D* C0MMUN17Y 15 H4PPY 2 H4V3 U 4B04RD!"
-      connect_to: "C0NN3C7 2"
-      connect_to_your_other_social_networks: "C0NN3C7 2 Y0UR 07H3R 50C14L N37W0RK5!"
-      connect_to_your_other_social_networks_explanation_p1: "C0NN3C71NG 2 53RV1C35 W1LL 4LL0W U 2 PUBL15H 0U7 2 7H353 53RV1C35!"
-      connect_to_your_other_social_networks_explanation_p2: "W17H F4C3B00K, U 4L50 B3 4BL3 2 F1ND FR13ND5 4LR34DY 0N D* 4ND 1NV173 07H3R5!"
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "C0NN3C7 W17H N00B5 BY PL4C1NG 7H3M 1N2 1 0R M0R3 0F Y0UR %{bold}."
-      connect_with_people_explanation_pt2: "45P3C75 4R3 4N 1N7U171V3 W4Y 2 GR0UP N3W 4ND F4M1L14R F4C35, PR1V473 2 U, 4LL0W1NG U 2 F1L73R D0WN 0R 5H4R3 5UB5375 0F YUR C0N74C75 3451LY!"
-      edit_profile: "3D17 PR0F1L3"
-      featured_tags: "F0LL0W F347UR3D 74G5!"
-      fill_out_your_profile: "F1LL 0U7 Y0UR PR0F1L3!"
-      find_friends: "F1ND N00B5"
-      find_friends_from_facebook: "F1ND N00B5 FR0M F4C3B00K!"
-      finished: "F1N15H3D!"
-      follow_your_interests: "F0LL0W Y0UR 1N73R3575!"
-      get_updates_from_core: "G37 N3W5 5B0U7 D* FR0M 7H3 C0R3 734M!"
       hashtag_explanation: "H45H74G5 4LL0W U 2 74LK 4B0U7 4ND F0LL0W Y0UR 1N73R3575! 7H3YR3 4L50 4 GR347 W4Y 2 F1ND N3W N00B5 0N D*!"
-      not_mandatory: "C0MPL371NG 7H3 F0LL0W1NG 573P5 W1LL 1MPR0V3 Y0UR D* 3XP3R13NC3, BU7 7H3Y 4R3 N07 M4ND470RY!"
-      profile_description: "M4K3 17 34513R F0R N00B5 2 F1ND U BY F1LL1NG 0U7 Y0UR PR0F1L3 1NF0RM4710N!"
-      profile_fields: 
-        bio: "B10"
-        birthday: "B1R7HD4Y"
-        gender: "G3ND3R"
-        location: "1P"
-        name: "N1CK"
-        photo: "PR0N"
-        tags: "74G5"
-      search_for_hashtags: "534RCH F0R #H45H74G5"
-      search_for_people: "534RCH F0R N00B5"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "W3LC0M3!"
-      welcome_with_name: "W3LC0M3, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "N0W G0 M0B1L3!"
       on_your_mobile_device: "0N Y0UR M0B1L3 D3V1C3 2 4CC355 D* M0B1L3!"
@@ -901,3 +896,4 @@ en_1337:
     no_person_constructed: "N0 P3R50N C0ULD B3 C0N57RUC73D FR0M 7H15 HC4RD!"
     not_enabled: "W3BF1NG3R D035 N07 533M 70 B3 3N4BL3D F0R %{account}'s H057!"
     xrd_fetch_failed: "3RR0R G3771NG XRD F0R %{account}!"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index aa3402928..e555eb38d 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -64,6 +64,9 @@ en_pirate:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this crew will not be able to see each other."
     contacts_visible: "Contacts in this crew will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ en_pirate:
       aspect_not_empty: "Crew not empty"
       remove: "remove"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ en_pirate:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No mateys"
       no_tags: "+ Find a tag to follow"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Yer Crews"
     many: "%{count} crews"
     move_contact: 
@@ -652,6 +654,8 @@ en_pirate:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ en_pirate:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "Set up connected services"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "all"
       all_contacts: "all contacts"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ en_pirate:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Dislike"
       hide_and_mute: "Hide and Mute"
       like: "Like"
@@ -763,7 +776,9 @@ en_pirate:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ en_pirate:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notifications when..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora id"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finished"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Day o' Birth"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ en_pirate:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index a023aba2e..5a22fec7f 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -64,6 +64,9 @@ en_shaw:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼."
     contacts_visible: "𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑦𐑯 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑢𐑦𐑤 𐑯𐑪𐑑 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑕𐑰 𐑰𐑗 𐑳𐑞𐑼."
     create: 
@@ -89,7 +92,6 @@ en_shaw:
       aspect_not_empty: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑯𐑪𐑑 𐑧𐑥𐑐𐑑𐑦"
       remove: "𐑮𐑦𐑥𐑵𐑝"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es 𐑦𐑟 𐑞 𐑓𐑻𐑕𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯 𐑳𐑯𐑛𐑼 𐑛𐑦𐑝𐑧𐑤𐑩𐑐𐑥𐑧𐑯𐑑."
         heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
@@ -111,17 +113,17 @@ en_shaw:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "𐑒𐑰𐑐 %{pod} 𐑮𐑳𐑯𐑦𐑙 𐑓𐑨𐑕𐑑, 𐑚𐑲 𐑬𐑮 𐑕𐑻𐑝𐑼𐑟 𐑞𐑺 𐑥𐑳𐑯𐑔𐑤𐑦 𐑒𐑪𐑓𐑦 𐑓𐑦𐑒𐑕!"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_tags: "𐑯𐑴 𐑑𐑨𐑜𐑟"
       people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑧𐑒𐑑 𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩:"
         heading: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     many: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     move_contact: 
@@ -652,6 +654,8 @@ en_shaw:
   search: "𐑕𐑻𐑗"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑖𐑩𐑯 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤."
     destroy: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑷𐑔𐑧𐑯𐑑𐑦𐑒𐑱𐑖𐑩𐑯."
@@ -711,15 +715,22 @@ en_shaw:
     notification: 
       new: "𐑯𐑿 %{type} 𐑓𐑮𐑪𐑥 %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑑 %{service}"
       manage: "𐑥𐑨𐑯𐑩𐑡 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "𐑐𐑳𐑚𐑤𐑦𐑒 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑢𐑦𐑤 𐑚𐑰 𐑩𐑝𐑱𐑤𐑩𐑚𐑩𐑤 𐑓𐑹 𐑳𐑞𐑼𐑟 𐑬𐑑𐑕𐑲𐑛 𐑝 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑑 𐑕𐑰."
+      share: "Share"
       title: "𐑕𐑧𐑑 𐑳𐑐 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "𐑷𐑤"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       discard_post: "𐑛𐑦𐑕𐑒𐑸𐑛 𐑐𐑴𐑕𐑑"
       make_public: "𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
@@ -730,6 +741,8 @@ en_shaw:
     reshare: 
       reshare: "𐑮𐑦𐑖𐑺"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "𐑛𐑦𐑕𐑤𐑲𐑒"
       hide_and_mute: "Hide and Mute"
       like: "𐑤𐑲𐑒"
@@ -763,7 +776,9 @@ en_shaw:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ en_shaw:
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       email_awaiting_confirmation: "𐑢𐑰 𐑣𐑨𐑝 𐑕𐑧𐑯𐑑 𐑿 𐑩𐑯 𐑨𐑒𐑑𐑦𐑝𐑱𐑖𐑩𐑯 𐑤𐑦𐑙𐑒 𐑑 %{unconfirmed_email}. 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑓𐑪𐑤𐑴 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒 𐑯 𐑨𐑒𐑑𐑦𐑝𐑱𐑑 𐑞 𐑯𐑿 𐑨𐑛𐑮𐑧𐑕, 𐑢𐑰 𐑢𐑦𐑤 𐑒𐑩𐑯𐑑𐑦𐑯𐑿 𐑑 𐑿𐑟 𐑿𐑼 𐑩𐑮𐑦𐑡𐑩𐑯𐑩𐑤 𐑨𐑛𐑮𐑧𐑕 %{email}."
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
+      getting_started: "New User Prefrences"
       liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑕𐑑𐑸𐑑𐑕 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿?"
       stream_preferences: "Stream Preferences"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑲𐑛𐑧𐑯𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑"
-      connect_to_your_other_social_networks: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑿𐑼 𐑳𐑞𐑼 𐑕𐑴𐑖𐑩𐑤 𐑯𐑧𐑑𐑢𐑼𐑒𐑕"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑢𐑦𐑞 𐑒𐑵𐑤 𐑐𐑰𐑐𐑩𐑤"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "𐑧𐑛𐑦𐑑 𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "𐑓𐑦𐑤 𐑬𐑑 𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤"
-      find_friends: "𐑓𐑲𐑯𐑛 𐑓𐑮𐑧𐑯𐑛𐑟"
-      find_friends_from_facebook: "𐑓𐑲𐑯𐑛 𐑓𐑮𐑧𐑯𐑛𐑟 𐑓𐑮𐑳𐑥 ·𐑓𐑱𐑕𐑚𐑫𐑒"
-      finished: "𐑓𐑦𐑯𐑦𐑖𐑑!"
-      follow_your_interests: "𐑓𐑪𐑤𐑴 𐑿𐑼 𐑦𐑯𐑑𐑮𐑧𐑕𐑑𐑕"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "𐑣𐑨𐑖𐑑𐑨𐑜𐑟 𐑩𐑤𐑬 𐑿 𐑑 𐑑𐑷𐑒 𐑩𐑚𐑬𐑑 𐑯 𐑓𐑪𐑤𐑴 𐑿𐑼 𐑦𐑯𐑑𐑮𐑧𐑕𐑑𐑕.  𐑞𐑺 𐑷𐑤𐑕𐑴 𐑩 𐑜𐑮𐑱𐑑 𐑢𐑱 𐑑 𐑓𐑲𐑯𐑛 𐑯𐑿 𐑐𐑰𐑐𐑩𐑤 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "𐑚𐑲𐑴"
-        birthday: "𐑚𐑻𐑔𐑛𐑱"
-        gender: "𐑡𐑧𐑯𐑛𐑼"
-        location: "𐑤𐑴𐑒𐑱𐑖𐑩𐑯"
-        name: "𐑯𐑱𐑥"
-        photo: "𐑓𐑴𐑑𐑴"
-        tags: "𐑑𐑨𐑜𐑟"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "𐑢𐑧𐑤𐑒𐑩𐑥 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
-      welcome_with_name: "𐑢𐑧𐑤𐑒𐑩𐑥, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ en_shaw:
     no_person_constructed: "𐑯𐑴 𐑐𐑻𐑕𐑩𐑯 𐑒𐑫𐑛 𐑚𐑰 𐑒𐑩𐑯𐑕𐑑𐑮𐑳𐑒𐑑𐑩𐑛 𐑓𐑮𐑪𐑥 𐑞𐑦𐑕 𐑣-𐑒𐑸𐑛."
     not_enabled: "𐑢𐑧𐑚𐑓𐑦𐑙𐑜𐑼 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑕𐑰𐑥 𐑑 𐑚𐑰 𐑦𐑯𐑱𐑚𐑩𐑤𐑛 𐑓𐑹 %{account}𐑟 𐑣𐑴𐑕𐑑"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 1adfe97cc..4edbcc748 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -17,7 +17,7 @@ eo:
         contact: 
           attributes: 
             person_id: 
-              taken: "devas uniki inter la kontaktoj de la uzanto."
+              taken: "devas esti unika meze de la kontaktoj tiu uzanto."
         person: 
           attributes: 
             diaspora_handle: 
@@ -25,7 +25,7 @@ eo:
         request: 
           attributes: 
             from_id: 
-              taken: "estas multobliga de ekzistanta peto."
+              taken: "estas multoblo de jam ekzistanta peto."
         reshare: 
           attributes: 
             root_guid: 
@@ -44,15 +44,15 @@ eo:
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALFA"
-      unknown_person: "nekonata homo"
+      unknown_person: "nekonata persono"
       video_title: 
-        unknown: "Nekonata Videtitolo"
+        unknown: "Nekonata video-titolo"
   are_you_sure: "Ĉu vi certas?"
   aspect_memberships: 
     destroy: 
-      failure: "Malsukceso forigi el aspekto"
-      no_membership: "Ne povis trovi la elektitan homon de tiu aspekto"
-      success: "Sukcese foriĝis homon de aspekto"
+      failure: "Forigi personon el aspekto malsukcesis"
+      no_membership: "Ne povis trovi la elektitan homon en tiu aspekto"
+      success: "Sukcese forigis tiun personon de la aspekto"
   aspects: 
     add_to_aspect: 
       failure: "Ne povis aldoni kontakton al aspekto."
@@ -61,35 +61,37 @@ eo:
       done_editing: "finita redakti"
     aspect_listings: 
       add_an_aspect: "+ Aldoni aspekton"
-      deselect_all: "Deselect all"
+      deselect_all: "Malselektu ĉion"
       edit_aspect: "Redakti %{name}-n"
-      select_all: "Select all"
+      select_all: "Selektu ĉion"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontaktoj en tiu aspekto ne povos vidi unu la aliajn."
     contacts_visible: "Kontaktoj en tiu aspekto povos vidi unu la alian."
     create: 
       failure: "Ne povis krei aspekton."
       success: "Via nova aspekto, %{name} kreiĝis"
     destroy: 
-      failure: "%{name} ne malplenas kaj ne povis foriĝi."
+      failure: "%{name} ne malplenas kaj ne povis esti forigita."
       success: "%{name} sukcese elpreniĝis."
     edit: 
-      add_existing: "Aldoni ekzistantan kontakton"
-      aspect_list_is_not_visible: "vi kaŝas aspektliston el aliaj en tiu aspekto"
-      aspect_list_is_visible: "vi montras aspektlisto al aliajn en tiu aspekto"
-      confirm_remove_aspect: "Ĉu vi certas, ke vi volas forigi tiun ĉi aspekton?"
+      add_existing: "Aldonu ekzistantan kontakton"
+      aspect_list_is_not_visible: "la aspekto-listo estas kaŝita de la aliaj en tiu aspekto"
+      aspect_list_is_visible: "la aspekto-listo estas montrata al la aliaj en tiu aspekto"
+      confirm_remove_aspect: "Ĉu vi certas, ke vi volas forviŝi tiun ĉi aspekton?"
       done: "Fina"
-      make_aspect_list_visible: "lasi, ke kontatoj en tiu ĉi aspekton povas vidi la aliajn?"
-      remove_aspect: "Forigi tiun ĉi aspekton"
-      rename: "Renomiĝi"
+      make_aspect_list_visible: "Ĉu kontaktoj en ĉi tiu aspekto povu vidi unu la aliajn?"
+      remove_aspect: "Forviŝu tiun ĉi aspekton"
+      rename: "renomi"
       update: "ĝisdatigi"
       updating: "ĝisdatiganta"
     few: "%{count} aspektoj"
     helper: 
-      are_you_sure: "Ĉu vi certas, ke vi volas forigi tiun ĉi aspekton?"
+      are_you_sure: "Ĉu vi certas, ke vi volas forviŝi tiun ĉi aspekton?"
       aspect_not_empty: "Aspekto ne malplenas"
       remove: "forigi"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es estas la unua DIASPORA* aplikaĵo developata."
         heading: "Konekti al Cubbi.es"
@@ -99,7 +101,7 @@ eo:
         content_2: "Donu ĝin al iu ajn, kaj tiu povos trovi vin ĉe DIASPORA*."
         heading: "DIASPORA* uzantnomo"
       donate: "Donaci"
-      handle_explanation: "Tiu ĉi estas via DIASPORA* uzantnomo.  Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
+      handle_explanation: "Tiu ĉi estas via DIASPORA* uzantnomo. Kiel retpoŝtadreso, vi povas doni tiun ĉi al homoj, por ke ili vin kontaktu."
       help: 
         do_you: "Ĉu vi:"
         email_feedback: "%{link} viajn respondojn, se vi volas"
@@ -111,50 +113,50 @@ eo:
         need_help: "Ĉu Devas Helpon?"
         satisfaction: "%{link}: Komunuma helpo"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Komunumaj lerniloj, instruadoj, kaj novaĵoj"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Helpu %{pod} rapide funkcii kaj aĉetu por niaj servkomputiloj ilian kaforiparon per ĉiumonata donatado!"
-      no_contacts: "Nul kontaktoj"
+      no_contacts: "neniuj kontaktoj"
       no_tags: "+ Trovi etikedon aboni"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
-      post_a_message: "Afiŝi mesaĝon »"
-      see_more_from_us: "See more of the D* community."
+      post_a_message: "Afiŝu mesaĝon »"
       services: 
         content: "Vi povas konekti la postajn servojn kun DIASPORA*:"
         heading: "Konekti Servojn"
       unfollow_tag: "Ne plu abonas #%{tag}."
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Viaj Aspektoj"
     many: "%{count} aspektoj"
     move_contact: 
       error: "Ne povis movi kontakton: %{inspect}"
       failure: "Eraro: %{inspect}"
-      success: "Kontakto moviĝis al alian aspekton"
+      success: "Kontakto moviĝis al nova aspekto"
     new: 
       create: "Krei"
       name: "Nomo (nur vidateblas de vi)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "komunuma reflektoro"
+      or_spotlight: "Aŭ vi povas dividi kun %{link}"
       try_adding_some_more_contacts: "Vi povas serĉi (supre) aŭ inviti (dekstre) pli kontaktojn."
       you_should_add_some_more_contacts: "Vi devus aldoni pli kontaktojn!"
     no_posts_message: 
-      start_talking: "Neniu jam diris iun ajn!"
+      start_talking: "Ankoraŭ neniu diris iun ajn!"
     one: "1 aspekto"
     other: "%{count} aspektoj"
     seed: 
       acquaintances: "Konatoj"
       family: "Familio"
       friends: "Amikoj"
-      work: "Verkejo"
+      work: "Laboro"
     selected_contacts: 
       manage_your_aspects: "Redakti viajn aspektojn."
       no_contacts: "Vi ne jam havas iujn ajn kontaktojn tie ĉi."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Vidu ĉiun Komunuman Reflektoron"
       view_all_contacts: "Vidi ĉiujn kontaktojn"
     show: 
       edit_aspect: "redakti aspekton"
     two: "%{count} aspektoj"
     update: 
-      failure: "Via aspekto, %{name}, havis tro longan nomon saviĝi."
+      failure: "Via aspekto, %{name}, havis tro longan nomon por konserviĝi."
       success: "Via aspekto, %{name}, sukcese redaktiĝis."
     zero: "neniu aspektoj"
   authorizations: 
@@ -163,11 +165,11 @@ eo:
       revoke_access: "Revoki Permeson"
   back: "Antaŭen"
   bookmarklet: 
-    explanation: "Vi povas poŝti al DIASPORA* el ĉie per legosignado la ligilon %{link}."
-    explanation_link_text: "tiu ĉi ligilo"
+    explanation: "Vi povas afiŝi al DIASPORA* el ĉie per paĝosigno montranta al %{link}."
+    explanation_link_text: "ĉi tiu ligilo"
     heading: "Legosigneto"
-    post_something: "Afiŝi iujn al DIASPORA*"
-    post_success: "Afiŝita!  Fermanta!"
+    post_something: "Afiŝi ion al DIASPORA*"
+    post_success: "Afiŝita! Fermanta!"
   cancel: "Rezigni"
   comments: 
     few: "%{count} komentoj"
@@ -178,7 +180,7 @@ eo:
     one: "1 komento"
     other: "%{count} komentoj"
     two: "%{count} komentoj"
-    zero: "neniu komento"
+    zero: "neniuj komentoj"
   contacts: 
     create: 
       failure: "Ne povis krei kontakton"
@@ -202,7 +204,7 @@ eo:
     sharing: 
       people_sharing: "Homoj, kiuj konigas kun vi:"
     spotlight: 
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Komunuma reflektoro"
     two: "%{count} kontaktoj"
     zero: "kontaktoj"
   conversations: 
@@ -210,27 +212,27 @@ eo:
       fail: "Malĝusta mesaĝo"
       sent: "Mesaĝo sendiĝis."
     destroy: 
-      success: "Interparolado sukcese foriĝas."
+      success: "Konversacio sukcese forviŝiĝis."
     helper: 
       new_messages: 
-        few: "%{count} novaj poŝtoj"
-        many: "%{count} novaj poŝtoj"
-        one: "1 nova poŝto"
-        other: "%{count} novaj poŝtoj"
+        few: "%{count} novaj mesaĝoj"
+        many: "%{count} novaj mesaĝoj"
+        one: "1 nova mesaĝo"
+        other: "%{count} novaj mesaĝoj"
         two: "%{count} novaj poŝtoj"
-        zero: "neniuj novaj poŝtoj"
+        zero: "neniuj novaj mesaĝoj"
     index: 
-      create_a_new_message: "krei novan poŝton"
-      inbox: "Mesaĝujo"
+      create_a_new_message: "krei novan mesaĝon"
+      inbox: "Poŝtujo"
       message_inbox: "Poŝtujo"
-      new_message: "Nova Poŝto"
-      no_conversation_selected: "ne interparolado estas elektita"
-      no_messages: "neniuj poŝtoj"
+      new_message: "Nova mesaĝo"
+      no_conversation_selected: "neniu interparolado elektita"
+      no_messages: "neniuj mesaĝoj"
     new: 
       abandon_changes: "Ĉu forlasi ŝanĝojn?"
       send: "Sendi"
       sending: "Poŝtanta..."
-      subject: "subjekto"
+      subject: "temo"
       to: "al"
     new_message: 
       fail: "Malĝusta poŝto"
@@ -243,12 +245,12 @@ eo:
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "Forigi"
+  delete: "Forviŝi"
   email: "Retpoŝtadreso"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Ĝustigu la postajn erarojn kaj reprovu."
-      invalid_fields: "Malvalidaj Kampoj"
+      invalid_fields: "Malvalidaj kampoj"
   fill_me_out: "Kompletu min"
   find_people: "Trovi homojn aŭ #etikedojn"
   hide: "Kaŝi"
@@ -256,74 +258,74 @@ eo:
     show: 
       already_account: "ĉu vi jam havas konton?"
       choice: "Elekto"
-      choice_explanation: "DIASPORA* povigas vin klasigi viajn kontaktojn en grupojn, kiuj nomiĝas „aspektoj“.  Unike al DIASPORA*, aspektoj certigi, ke vi nur konigi viajn bildojn, rakontojn, kaj ŝercojn kun homoj, kun kiuj vi volas kontigi."
-      learn_about_host: "Lerni pri tiel, kiel havi vian mem DIASPORA*an servilon."
-      login_here: "ensaluti tie ĉi"
+      choice_explanation: "DIASPORA* ebligas vin klasigi viajn kontaktojn en grupojn, kiuj nomiĝas „aspektoj“. Unike al DIASPORA*, aspektoj certigas, ke vi nur konigas viajn bildojn, rakontojn, kaj ŝercojn al homojal kiuj vi tion intencas."
+      learn_about_host: "Lernu pri kiel starigi propran Diaspora-servilon."
+      login_here: "ensalutu ĉi tie"
       ownership: "Proprieto"
-      ownership_explanation: "Vi posedas viajn bildojn, kaj vi ne devus rezigni tiun, por konigi ilin.  Vi ankoraŭ havas proprieton de ĉiu, kiun vi konigi per DIASPORA*, donante al vi kompletan administradon pri tiel, kiel aĵoj disdoniĝas."
-      share_what_you_want: "Partopreni tiun, kiun vi volas, kun kiu vi volas."
+      ownership_explanation: "Vi posedas viajn bildojn, kaj vi ne devus rezigni tiun, por konigi ilin. Vi ankoraŭ havas proprieton de ĉio, kiun vi konigas per Diaspora, donante al vi kompletan administradon pri kiel aĵoj disdoniĝas."
+      share_what_you_want: "Konigu kion vi volas, al kiu vi volas."
       simplicity: "Simpleco"
-      simplicity_explanation: "DIASPORA* igas konigadon facilan – kaj ankaŭ privatecon.  Private per plano, DIASPORA* ne direktas tra multajn paĝojn de agordoj kaj opcioj, por sekurigi vian profilon."
-      tagline_first_half: "Konigi tio, kio vi volas,"
+      simplicity_explanation: "DIASPORA* purigas kaj faciligas konigadon – kaj ankaŭ privatecon. DIASPORA* ne direktas tra multaj paĝoj de agordoj kaj opcioj por sekurigi vian profilon ĉar ĝi estas planita por privateco."
+      tagline_first_half: "Dividu kion vi volas,"
       tagline_second_half: "kun kiu vi volas."
   invitations: 
     a_facebook_user: "Facebook uzanto"
     check_token: 
       not_found: "Ne povis trovi invitan ĵetonon"
     create: 
-      already_contacts: "Vi jam konektis kun tiu homo."
-      already_sent: "Vi jam invitis tiun homon."
-      no_more: "Vi ne havas iujn ajn invitojn."
+      already_contacts: "Vi jam konektiĝis kun tiu persono."
+      already_sent: "Vi jam invitis tiun persono."
+      no_more: "Vi ne plu havas invitojn."
       own_address: "Vi ne povas sendi inviton al vian mem adreson."
       rejected: "La postaj retpoŝtadresoj estis problemaj:"
-      sent: "Invitoj sendiĝis al: "
+      sent: "Invitoj sendiĝis al:"
     edit: 
       accept_your_invitation: "Akcepti vian inviton"
       your_account_awaits: "Via konto ĝisatendas!"
     new: 
       already_invited: "Tiuj homoj ankoraŭ ne akceptis vian inviton:"
       aspect: "Aspekto"
-      comma_seperated_plz: "Vi povas aldoni multajn retpoŝtadresojn, apartate de komoj."
+      comma_seperated_plz: "Vi povas aldoni multajn retpoŝtadresojn, apartate per komoj."
       if_they_accept_info: "se tiu akceptos, tiu aldoniĝos al la aspekto, en kiun vi invitis tiun."
-      invite_someone_to_join: "Invitu iujn ajn aniĝi DIASPORA*!"
+      invite_someone_to_join: "Invitu iun aniĝi al DIASPORA*!"
       personal_message: "Persona mesaĝo"
       resend: "Resendi"
       send_an_invitation: "Sendu inviton"
-      send_invitation: "Sendi inviton"
+      send_invitation: "Sendu la inviton"
       to: "Al"
   layouts: 
     application: 
       powered_by: "FUNKCIAS PER DIASPORA*"
       public_feed: "Publika DIASPORA* Afiŝostrio de %{name}"
-      toggle: "inversigi al poŝtelefona retpaĝaro"
-      whats_new: "Kio estas nova?"
+      toggle: "baskuligu poŝtelefona versio"
+      whats_new: "kio estas nova?"
       your_aspects: "viaj aspektoj"
     header: 
       admin: "administristo"
       blog: "blogo"
-      code: "kodo (?)"
+      code: "kodo"
       login: "ensaluti"
       logout: "elsaluti"
-      profile: "profilo"
+      profile: "Profilo"
       recent_notifications: "Freŝaj sciigoj"
-      settings: "agordoj"
+      settings: "Agordoj"
       view_all: "Vidi ĉiujn"
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} malŝatadoj"
-        many: "%{count} malŝatadoj"
-        one: "%{count} malŝatado"
-        other: "%{count} malŝatadoj"
+        few: "%{count} malŝatantoj"
+        many: "%{count} malŝatantoj"
+        one: "%{count} malŝatanto"
+        other: "%{count} malŝatantoj"
         two: "%{count} malŝatadoj"
-        zero: "neniu ŝatado"
+        zero: "neniuj ŝatantoj"
       people_like_this: 
-        few: "%{count} ŝatadoj"
-        many: "%{count} ŝatadoj"
-        one: "%{count} ŝatado"
-        other: "%{count} ŝatadoj"
+        few: "%{count} ŝatantoj"
+        many: "%{count} ŝatantoj"
+        one: "%{count} ŝatanto"
+        other: "%{count} ŝatantoj"
         two: "%{count} ŝatadoj"
-        zero: "neniu ŝatado"
+        zero: "neniuj ŝatantoj"
       people_like_this_comment: 
         few: "%{count} ŝatadoj"
         many: "%{count} ŝatadoj"
@@ -331,10 +333,10 @@ eo:
         other: "%{count} ŝatadoj"
         two: "%{count} ŝatadoj"
         zero: "neniu ŝatado"
-  limited: "Malpublika"
+  limited: "Limita"
   more: "Pli"
-  next: "poste"
-  no_results: "Neniuj Resultoj Trovitaj"
+  next: "sekva"
+  no_results: "Neniuj rezultoj trovitaj"
   notifications: 
     also_commented: 
       few: "%{actors} ankaŭ komentis pri %{post_link} de %{post_author}."
@@ -374,7 +376,7 @@ eo:
         other: "kaj %{count} aliaj"
         two: "kaj %{count} aliaj"
         zero: "kaj neniu alia"
-      mark_all_as_read: "Marki ĉiuj Kiel Legita"
+      mark_all_as_read: "Marku ĉiujn kvazaŭ legita"
       notifications: "Sciigoj"
     liked: 
       few: "%{actors} ĵus ŝatis vian %{post_link}."
@@ -413,10 +415,10 @@ eo:
       two: "%{actors} poŝtis al vi poŝton."
       zero: "%{actors} sendis al vi poŝton."
     reshared: 
-      few: "%{actors} repartoprenis vian %{post_link}."
-      many: "%{actors} repartoprenis vian %{post_link}."
+      few: "%{actors} rekonigis vian %{post_link}."
+      many: "%{actors} rekonigis vian %{post_link}."
       one: "%{actors} repartoprenis vian %{post_link}."
-      other: "%{actors} repartoprenis vian %{post_link}."
+      other: "%{actors} rekonigis vian %{post_link}."
       two: "%{actors} repartoprenis vian %{post_link}."
       zero: "%{actors} repartoprenis vian %{post_link}."
     reshared_post_deleted: 
@@ -452,10 +454,10 @@ eo:
     private_message: 
       reply_to_or_view: "Respondi al aŭ vidi tiun ĉi interparoladon >"
     reshared: 
-      reshared: "%{name} ĵus repartoprenis vian afiŝon."
+      reshared: "%{name} rekonigis vian afiŝon."
       view_post: "Vidu afiŝon >"
     single_admin: 
-      admin: "Via DIASPORA* administristo"
+      admin: "Via DIASPORA* administranto"
       subject: "Mesaĝo pri via DIASPORA* konto:"
     started_sharing: 
       sharing: "komencis konigi kun vi!"
@@ -471,19 +473,19 @@ eo:
     add_contact_small: 
       add_contact_from_tag: "aldoni kontakton de etikedo"
     aspect_list: 
-      edit_membership: "redakti aspektan anecon"
-    few: "%{count} homoj"
+      edit_membership: "redakti aspektan anaron"
+    few: "%{count} personoj"
     helper: 
-      people_on_pod_are_aware_of: " homoj ĉe guŝo konscii pri"
-      results_for: " rezultoj por %{params}"
+      people_on_pod_are_aware_of: "homoj ĉe tiu ĉi Pod konscias pri"
+      results_for: "rezultoj por %{params}"
     index: 
-      couldnt_find_them_send_invite: "Ĉu ne povis trovi tiun?  Sendu inviton!"
+      couldnt_find_them_send_invite: "Ĉu vi ne povis trovi tiun? Sendu inviton!"
       no_one_found: "...kaj neniu troviĝis."
-      no_results: "Ho!  Vi devas serĉi iujn!"
+      no_results: "Hej! Vi devas serĉi ion."
       results_for: "trovrezultoj por"
-    many: "%{count} homoj"
-    one: "1 homo"
-    other: "%{count} homoj"
+    many: "%{count} personoj"
+    one: "1 persono"
+    other: "%{count} personoj"
     person: 
       add_contact: "aldoni kontakton"
       already_connected: "Jam ligita"
@@ -499,18 +501,18 @@ eo:
       remove_contact: "forigi kontakton"
       remove_from: "Ĉu forigi %{name} de %{aspect}?"
     show: 
-      does_not_exist: "Homo ne ekzistas!"
+      does_not_exist: "Persono ne ekzistas!"
       has_not_shared_with_you_yet: "%{name} ne jam partoprenis iuj ajn afiŝojn kun vi!"
       incoming_request: "%{name} volas konigi kun vi"
       mention: "Mencii"
-      message: "Poŝto"
-      not_connected: "Vi ne konigi kun tiu ĉi homo"
+      message: "Mesaĝo"
+      not_connected: "Vi ne estas dividanta kun tiu ĉi homo"
       recent_posts: "Freŝaj Afiŝoj"
       recent_public_posts: "Freŝaj Publikaj Afiŝoj"
-      return_to_aspects: "Reiri al vian aspekton paĝon"
-      see_all: "Vidi ĉiujn"
-      start_sharing: "komenci konigi"
-      to_accept_or_ignore: "akcepti aŭ ignori ĝin."
+      return_to_aspects: "Reiri al via aspekto-paĝo"
+      see_all: "Vidu ĉion"
+      start_sharing: "komencu konigi"
+      to_accept_or_ignore: "por akcepti aŭ ignori ĝin."
     sub_header: 
       add_some: "aldoni iujn"
       edit: "redakti"
@@ -518,15 +520,15 @@ eo:
     two: "%{count} homoj"
     webfinger: 
       fail: "Ni bedaŭras, sed ni ne povis trovi je %{handle}."
-    zero: "neniu homo"
+    zero: "neniuj personoj"
   photos: 
     comment_email_subject: "la bildo de %{name}"
     create: 
-      integrity_error: "Ne povis alŝuti bildon.  Ĉu vi certas, ke tiu estis bilda doseiro?"
-      runtime_error: "Ne povis alŝuti bildon.  Probable estis la farado de unu el tiuj Volapukistoj."
-      type_error: "Ne povis alŝuti bildon.  Ĉu vi certas, ke vi aldonis bildon?"
+      integrity_error: "Alŝuti bildon malsukcesis. Ĉu vi certas, ke tiu estis bilda dosiero?"
+      runtime_error: "Alŝuti bildon malsukcesis. Probable estis la farado de unu el tiuj Volapukistoj."
+      type_error: "Alŝuti bildon malsukcesis. Ĉu vi certas, ke vi aldonis bildon?"
     destroy: 
-      notice: "Forigis bildon."
+      notice: "Bildo forviŝiĝis."
     edit: 
       editing: "Redaktanta"
     new: 
@@ -536,20 +538,20 @@ eo:
     new_photo: 
       empty: "{file} malplenas; bonvolu reelekti dosierojn sen ĝin."
       invalid_ext: "{file} havas malvalidan sufikson. Nur {extensions} estas validaj."
-      size_error: "{file} estas tro ega; la maksimuma dosiergrandeco estas {sizeLimit}."
+      size_error: "{file} estas tro granda; la maksimuma dosiergrandeco estas {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "aŭ elektu unu el via jamekzista"
-      upload: "Alŝuti novan profilbildon!"
+      or_select_one: "aŭ elektu unu el via jam ekzistanta"
+      upload: "Alŝutu novan profilbildon!"
     photo: 
-      view_all: "Vidi ĉiuj bildoj de %{name}"
+      view_all: "Vidi ĉiujn bildojn de %{name}"
     show: 
-      collection_permalink: "malŝanĝantligilo de aro"
-      delete_photo: "Forigi Bildon"
+      collection_permalink: "konstanta ligilo de la kolekto"
+      delete_photo: "Forviŝu bildon"
       edit: "redakti"
-      edit_delete_photo: "Redakti bildpriskribon / forigi bildon"
+      edit_delete_photo: "Redakti bildpriskribon / forviŝi bildon"
       make_profile_photo: "estigi profilbildon"
       show_original_post: "Vidu originalan afiŝon."
-      update_photo: "Ĝisdatigi Bildon"
+      update_photo: "Ĝisdatigi bildon"
     update: 
       error: "Ne povis redakti bildon."
       notice: "Bildo sukcese ĝisdatiĝis."
@@ -562,15 +564,15 @@ eo:
       destroy: "Forlasi"
       not_found: "Ni bedaŭras, sed ni ne povis trovi tiun afiŝon."
       permalink: "malŝanĝantligilo"
-  previous: "antaŭe"
+  previous: "antaŭa"
   profile: "Profilo"
   profiles: 
     edit: 
-      allow_search: "Lasu homoj serĉi por vi ene de DIASPORA*"
+      allow_search: "Lasu homoj serĉi vin ene de DIASPORA*"
       edit_profile: "Redakti profilon"
       first_name: "Persona nomo"
       last_name: "Familinomo"
-      update_profile: "Ĝisdatigi Profilon"
+      update_profile: "Ĝisdatigi profilon"
       your_bio: "Via biografio"
       your_birthday: "Via naskiĝtago"
       your_gender: "Via sekso"
@@ -578,12 +580,12 @@ eo:
       your_name: "Via nomo"
       your_photo: "Via bildo"
       your_private_profile: "Via nepublika profilo"
-      your_public_profile: "Via nepublika profilo"
-      your_tags: "En kvin vortoj priskribu vin mem."
-      your_tags_placeholder: "ekz. #diaspora #gladado #katidoj #muziko"
+      your_public_profile: "Via publika profilo"
+      your_tags: "Per kvin vortoj priskribu vin mem."
+      your_tags_placeholder: "ekz. #filmoj #katidoj #vojaĝi #instruisto #novjorko"
     update: 
       failed: "Ne povis ĝisdatigi profilon"
-      updated: "Ĝisdatigi profilon"
+      updated: "Profilo ĝisdatigita"
   public: "Publika"
   reactions: 
     few: "%{count} reakcioj"
@@ -595,11 +597,11 @@ eo:
   registrations: 
     closed: "Registrado estas ferma ĉe tiu ĉi DIASPORA* guŝo."
     create: 
-      success: "Vi aniĝis DIASPORA*!"
+      success: "Vi aniĝis al DIASPORA*!"
     edit: 
       cancel_my_account: "Malfari mian konton"
       edit: "Redakti je %{name}"
-      leave_blank: "(restigi blanke, se vi ne volas ŝanĝi ĝin)"
+      leave_blank: "(lasu blanka, se vi ne volas ŝanĝi ĝin)"
       password_to_confirm: "(ni bezonas vian nunan pasvorton por konfirmi viajn ŝanĝojn)"
       unhappy: "ĉu malfeliĉas?"
       update: "Ĝisdatigi"
@@ -608,17 +610,17 @@ eo:
       enter_email: "Enskribu retpoŝtadreson"
       enter_password: "Enskribu pasvorton"
       enter_password_again: "Enskribu la saman pasvorton, kiel antaŭe"
-      enter_username: "Elekti uzantnomon (nur literojn, nombrojn, kaj substrekojn)"
+      enter_username: "Elektu uzantnomon (nur literojn, nombrojn, kaj substrekojn)"
       join_the_movement: "Aniĝu je la movado!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Interkona retkonektadi kun <3"
   requests: 
     create: 
       sending: "Sendanta"
-      sent: "Vi petis kontigi kun %{name}.  Tiu homo devus vidi vian peton, kiam si sekvonte ensalutos al DIASPORA*."
+      sent: "Vi petis dividi kun %{name}. Via peto al tiu(j) videblos je ties venonta ensalutiĝo al DIASPORA*."
     destroy: 
       error: "Bonvolu elekti aspekton!"
-      ignore: "Ignorigis kontaktan peton."
-      success: "Vi nun kontigas."
+      ignore: "Ignoris kontaktan peton."
+      success: "Vi nun dividadas."
     helper: 
       new_requests: 
         few: "%{count} novaj petoj!"
@@ -626,10 +628,10 @@ eo:
         one: "nova peto!"
         other: "%{count} novaj petoj!"
         two: "%{count} novaj petoj!"
-        zero: "neniu nova peto"
+        zero: "neniuj novaj petoj"
     manage_aspect_contacts: 
       existing: "Ekzistantaj kontaktoj"
-      manage_within: "Administrigi kontaktojn ene de"
+      manage_within: "Administri kontaktojn ene de"
     new_request_to_person: 
       sent: "sendita!"
   reshares: 
@@ -652,11 +654,13 @@ eo:
   search: "Serĉi"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Aŭtentigo malsukcesis."
       success: "Aŭtentokontrolo sukcesis."
     destroy: 
-      success: "Sukcese forigi aŭtentoindiko."
+      success: "Sukcese forigis aŭtentigon."
     failure: 
-      error: "estis eraro, kiam ni provis konektigi tiun servon"
+      error: "estis eraro, kiam ni provis konekti tiun servon"
     finder: 
       no_friends: "Neniuj Facebook amikoj trovitaj."
       service_friends: "%{service} Amikoj"
@@ -666,11 +670,11 @@ eo:
       connect_to_twitter: "Ligi al Twitter"
       disconnect: "malkonekti"
       edit_services: "Redakti servojn"
-      logged_in_as: "ensalutis, kiel"
+      logged_in_as: "ensalutinta kiel"
       no_services: "Vi ankoraŭ ne konektis iujn ajn servojn."
-      really_disconnect: "ĉu malkonektu el %{service}?"
+      really_disconnect: "ĉu vi volas malkonekti %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Iru al tiun ligilon por akcepti vian inviton"
+      click_link_to_accept_invitation: "Sekvu tiun ligilon por akcepti vian inviton"
       join_me_on_diaspora: "Kuniĝu kun mi ĉe DIASPORA*"
     remote_friend: 
       invite: "inviti"
@@ -682,8 +686,8 @@ eo:
       add_new_contact: "Aldoni novan kontakton"
       create_request: "Trovi per DIASPORA* uzantnomo"
       diaspora_handle: "diaspora@pod.org"
-      enter_a_diaspora_username: "Aldonu DIASPORA* uzantnomo:"
-      know_email: "Ĉu vi scias ties retpoŝtadreson?  Vi devus inviti tiun."
+      enter_a_diaspora_username: "Enmetu DIASPORA* uzantnomon:"
+      know_email: "Ĉu vi scias iliajn retpoŝtadresojn? Vi devus inviti ilin"
       your_diaspora_username_is: "Via DIASPORA* uzantnomo estas: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "Aldoni kontakton"
@@ -697,53 +701,62 @@ eo:
     contact_list: 
       all_contacts: "Ĉiuj kontaktoj"
     footer: 
-      logged_in_as: "ensalutita, kiel %{name}"
+      logged_in_as: "ensalutinta, kiel %{name}"
       your_aspects: "viaj aspektoj"
     invitations: 
-      by_email: "Per retpoŝtado"
-      dont_have_now: "Vi ne havas iujn ajn nun, sed pli invitoj baldaŭ venos!"
+      by_email: "Per retpoŝto"
+      dont_have_now: "Vi ne havas iujn ajn nun, sed pli da invitoj baldaŭ venos!"
       from_facebook: "El Facebook"
-      invitations_left: "%{count} postrestantas"
+      invitations_left: "ankoraŭ %{count}"
       invite_someone: "Inviti iun"
       invite_your_friends: "Invitu viajn amikojn"
       invites: "Invitoj"
-      invites_closed: "Invitoj nun ne malfermas ĉe tiu ĉi DIASPORA* gaŝo"
+      invites_closed: "Invitoj intertempe ne eblas ĉe tiu ĉi DIASPORA* ido"
     notification: 
       new: "Nova %{type} de %{from}"
     public_explain: 
-      logged_in: "ensalutita al %{service}"
+      control_your_audience: "Control your Audience"
+      logged_in: "ensalutinta al %{service}"
       manage: "administri ligitajn servojn"
-      outside: "Publikaj afiŝoj vidateblos de aliaj, kiuj estas ekster DIASPORA*."
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      outside: "Publikaj afiŝoj estos videblaj al aliaj, kiuj estas ekster DIASPORA*."
+      share: "Share"
       title: "Agordi ligitajn servojn"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "ĉiuj"
       all_contacts: "ĉiuj kontaktoj"
-      discard_post: "Forlasi afiŝon"
+      discard_post: "Forviŝi afiŝon"
       make_public: "publikigi"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Afiŝi al %{aspect}"
       posting: "Afiŝanta..."
-      publishing_to: "eldonanta al: "
-      share: "Partopreni"
-      share_with: "kontigi kun"
+      publishing_to: "koniganta al: "
+      share: "Konigi"
+      share_with: "konigi kun"
       upload_photos: "Alŝuti bildojn"
       whats_on_your_mind: "Kion vi nun pensas?"
     reshare: 
-      reshare: "Rekontigi"
+      reshare: "Rekonigi"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Malŝati"
       hide_and_mute: "Malvidebligi kaj malsciiĝi"
       like: "Ŝati"
       shared_with: "Partoprenita kun: %{aspect_names}"
       unlike: "Ne plu ŝati"
-      via: "de %{link}"
+      via: "per %{link}"
       viewable_to_anyone: "Tiu ĉi afiŝo videblas de iu ajn ĉe la reto"
   status_messages: 
     create: 
-      success: "Sukcese mencigis: %{names}"
+      success: "Sukcese menciis: %{names}"
     destroy: 
-      failure: "Ne povis forigi afiŝon"
+      failure: "forviŝi afiŝon malsukcesis"
     helper: 
-      no_message_to_display: "Ne afiŝoj vidiĝi."
+      no_message_to_display: "Neniu afiŝo montrenda."
     new: 
       mentioning: "Mencianta: %{person}"
     too_long: 
@@ -758,26 +771,28 @@ eo:
     show_more_comments: "Videbligi %{number} pli komentojn"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
+      title: "Viaj Aspektoj"
+    aspects_stream: "Aspektoj"
+    commented_on: "komentis pri"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      follow: "Follow"
+      title: "#Sekvataj etikedoj"
+    followed_tags_stream: "#Sekvataj etikedoj"
+    mentioned_stream: "@Mencioj"
     mentions: 
       contacts_title: "Homoj, kiuj menciis vin"
-      title: "Viaj Mencioj"
+      title: "@Mencioj"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Homoj en via Torento"
+      title: "Torento"
+    posted: "afiŝis"
     public: 
-      contacts_title: "Recent Posters"
-      title: "Public Activity"
-    recently: "recently:"
+      contacts_title: "ĵusaj afiŝintoj"
+      title: "publika aktiveco"
+    recently: "freŝdate:"
     tags: 
       contacts_title: "Homoj, al kiuj tiuj ĉi etikedoj plaĉas"
       title: "Afiŝoj etikeditaj: %{tags}"
@@ -791,10 +806,10 @@ eo:
   tags: 
     show: 
       follow: "Aboni al #%{tag}"
-      followed_by: "followed by"
+      followed_by: "sekvata de"
       following: "Abonita al #%{tag}"
-      nobody_talking: "Neniu jam parolas pri %{tag}."
-      people_tagged_with: "Homoj etikediĝis kun %{tag}"
+      nobody_talking: "Ankoraŭ neniu parolas pri %{tag}."
+      people_tagged_with: "Personoj etikediĝis kun %{tag}"
       posts_tagged_with: "Afiŝoj etikediĝis kun #%{tag}"
       stop_following: "Malaboni de #%{tag}"
   tokens: 
@@ -810,13 +825,13 @@ eo:
       typical_userpage: "Tipa cubbi.es uzantpaĝo"
       via: "(de %{link})"
       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."
-  undo: "Ĉu malfarigi?"
+  undo: "Ĉu malfari?"
   username: "Uzantnomo"
   users: 
     confirm_email: 
       email_confirmed: "Retpoŝtadreso %{email} aktiviĝis"
       email_not_confirmed: "Retpoŝtadreso ne povis aktiviĝi. Ĉu malĝusta ligilo?"
-    destroy: "Via konto ŝlositas. Eble esti ĝis 20 minutoj antaŭ ni fini forigi vian konton.  Dankon por via provado je DIASPORA*"
+    destroy: "Via konto ŝlosiĝis. Povas daŭri 20 minutoj antaŭ ni forigado de via konto finiĝos. Dankon por via provado de DIASPORA*."
     edit: 
       also_commented: "...iu ankaŭ komentis pri la afiŝo de via kontakto?"
       change: "Ŝanĝi"
@@ -824,59 +839,39 @@ eo:
       change_language: "Ŝanĝi lingvon"
       change_password: "Ŝanĝi pasvorton"
       close_account: "Malaniĝi"
-      comment_on_post: "...iu komentas pri via poŝto?"
+      comment_on_post: "...iu komentas pri via afiŝo?"
       current_password: "Nuna pasvorto"
-      download_photos: "elŝuti mian bildojn"
-      download_xml: "elŝuti mian xml"
+      download_photos: "elŝuti miajn bildojn"
+      download_xml: "elŝuti mian XMLn"
       edit_account: "Redakti konton"
       email_awaiting_confirmation: "Ni poŝtis al vin aktivigadan ligilon ĉe %{unconfirmed_email}.  Ĝis vi klikos tiun ĉi ligilo kaj aktivigos la novan repoŝtadreson, ni uzados vian malŝanĝitan retpoŝtadreson %{email}."
-      export_data: "Eksporti Datumojn"
+      export_data: "Eksporti datumojn"
+      getting_started: "New User Prefrences"
       liked: "...iu ŝatis vian afiŝon?"
-      mentioned: "...vi menciatas en afiŝo?"
+      mentioned: "...vi estas menciita en afiŝo?"
       new_password: "Nova pasvorto"
-      private_message: "...vi ricevas malpublikan poŝton?"
+      photo_export_unavailable: "Photo exporting currently unavailable"
+      private_message: "...vi ricevas malpublikan mesaĝon?"
       receive_email_notifications: "Ĉu ricevi retpoŝtajn sciigojn, kiam..."
       reshared: "...iu repartoprenas vian afiŝon?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Ĉu montri Komunuman Reflektoron en Torento?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...iu komencis konigi kun vi?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Torentaj agordoj"
       your_email: "Via retpoŝtadreso"
       your_handle: "Via DIASPORA* uzantnomo"
     getting_started: 
-      bold: "aspektoj"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "La komunumo de DIASPORA* feliĉas, ke vi aniĝis!"
-      connect_to: "Ligi al"
-      connect_to_your_other_social_networks: "Ligi al viaj aliaj sociaj retoj"
-      connect_to_your_other_social_networks_explanation_p1: "La konektado de servoj lasos, ke vi eldonu al tiujn ĉi servojn."
-      connect_to_your_other_social_networks_explanation_p2: "Per Facebook, vi ankaŭ povos trovi amikojn, kiuj jam estas ĉe DIASPORA*, kaj inviti aliajn."
-      connect_with_people: "Koniĝi kun mojosaj homoj"
-      connect_with_people_explanation_pt1: "Partopreni kun homoj, aldonu tiujn en unu aŭ pli el viaj %{bold}."
-      connect_with_people_explanation_pt2: "Aspektojn estas facilkomprenita metodo arigi novajn kaj familiarajn homojn, malpublike al vi, lasante, ke vi filtras aŭ partoprenas kun subaroj el viaj kontaktojn facile."
-      edit_profile: "Redakti Profilon"
-      featured_tags: "Alboni prezentatajn etikedojn"
-      fill_out_your_profile: "Kompletigu vian profilon"
-      find_friends: "Trovi amikojn"
-      find_friends_from_facebook: "trovi amikojn per Facebook"
-      finished: "Finita"
-      follow_your_interests: "Aboni viajn interesigojn"
-      get_updates_from_core: "Ricevi ĝisdatigoj pri la projekto el la ĉefteamo."
       hashtag_explanation: "Etikedoj lasu vin pridiri kaj aboni viajn interesigojn.  Ili ankaŭ estas bona metodo trovi novajn homojn ĉe DIASPORA*."
-      not_mandatory: "La kompletado de la postaj taskoj plibonigos vian DIASPORA* travivadon, sed tiun oni ne bezonas."
-      profile_description: "Igi pli facile, ke homoj trovos vin, tutigu vian profilan informaĵon."
-      profile_fields: 
-        bio: "Pri vi"
-        birthday: "Naskiĝtago"
-        gender: "Sekso"
-        location: "Loko"
-        name: "Nomo"
-        photo: "Profilbildo"
-        tags: "Etikedoj"
-      search_for_hashtags: "Serĉi por #etikedoj"
-      search_for_people: "Serĉi por homoj"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Bonvenon!"
-      welcome_with_name: "Bonvenon, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Nun uzu poŝtelefonan!"
       on_your_mobile_device: "per via poŝtelefono uzi DIASPORA* poŝtelefonan."
@@ -886,18 +881,19 @@ eo:
     public: 
       does_not_exist: "Uzanto %{username} ne ekzistas!"
     update: 
-      email_notifications_changed: "Retpoŝtaj sciigoj ŝanĝitas"
-      language_changed: "Lingvo ŝanĝiĝis"
+      email_notifications_changed: "Retpoŝtaj sciigoj ŝanĝitaj"
+      language_changed: "Lingvo ŝanĝita"
       language_not_changed: "Ne povis ŝanĝi lingvon"
-      password_changed: "Pasvorto ŝanĝita.  Vi nun povas ensaluti per via nova pasvorto."
-      password_not_changed: "Ne povis ŝanĝi pasvorton"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      password_changed: "Pasvorto ŝanĝita. Vi nun povas ensaluti per via nova pasvorto."
+      password_not_changed: "Ŝanĝi pasvorton malsukcesis"
+      settings_not_updated: "Ĝisdatigi agordojn malsukcesis"
+      settings_updated: "Agordoj gxisdatigxis"
       unconfirmed_email_changed: "Retpoŝtadreso ŝanĝiĝis.  Devas aktivigadon."
       unconfirmed_email_not_changed: "Ne povis ŝanĝigis retpoŝtadreson."
   webfinger: 
     fetch_failed: "ne povas alporti webfinger-an profilon por %{profile_url}"
-    hcard_fetch_failed: "estis problemo, kiam ni alportis la hcard-on de #{@account}"
-    no_person_constructed: "Neniu povas konstruiti per tiu hcard."
-    not_enabled: "webfinger ne ŝajnas ebligi ĉe la servilo de %{account}"
-    xrd_fetch_failed: "estis eraro, kiam la xrd de konto %{account} alportiĝis"
+    hcard_fetch_failed: "estis problemo venigi la hcard-on de @{account}"
+    no_person_constructed: "Neniu persono povis esti kreita per tiu ĉi hcard."
+    not_enabled: "webfinger ŝajnas ne esti ŝaltita ĉe la servilo de %{account}"
+    xrd_fetch_failed: "estis eraro dum la venigado de al xrd de konto %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 7241557d3..d163bd2f3 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -64,6 +64,9 @@ es-AR:
       deselect_all: "De-seleccionar todo"
       edit_aspect: "Editar %{name}"
       select_all: "Seleccionar todo"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Los contactos en este aspecto no van a poder verse entre ellos."
     contacts_visible: "Los contactos en este aspecto van a poder verse entre ellos."
     create: 
@@ -89,7 +92,6 @@ es-AR:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es es la primera aplicación de Diáspora* en desarrollo."
         heading: "Conectar a Cubbi.es"
@@ -111,17 +113,17 @@ es-AR:
         need_help: "Necesitás ayuda?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No hay contactos"
       no_tags: "No tags"
       people_sharing_with_you: "Comparten con vos"
       post_a_message: "publicar un mensaje >>"
-      see_more_from_us: "Mira mas de la comunidad D*."
       services: 
         content: "Podés conectar los siguientes servicios a Diáspora:"
         heading: "Conectar Servicios"
       unfollow_tag: "Dejar de seguir #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -132,7 +134,7 @@ es-AR:
       create: "Crear"
       name: "Nombre"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
+      community_spotlight: "comunidad creativa"
       or_spotlight: "Or you can share with %{link}"
       try_adding_some_more_contacts: "Podés buscar (arriba) o invitar (derecha) más contactos."
       you_should_add_some_more_contacts: "Deberías agregar más contactos!"
@@ -148,7 +150,7 @@ es-AR:
     selected_contacts: 
       manage_your_aspects: "Administra tus aspectos."
       no_contacts: "Todavía no tenés ningún contacto aquí."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Ver \"Comunidad Creativa\""
       view_all_contacts: "Ver todos los contactos"
     show: 
       edit_aspect: "editar aspecto"
@@ -202,7 +204,7 @@ es-AR:
     sharing: 
       people_sharing: "Compartiendo con vos:"
     spotlight: 
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Comunidad Creativa"
     two: "%{count} contactos"
     zero: "contactos"
   conversations: 
@@ -652,6 +654,8 @@ es-AR:
   search: "Buscar"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Autenticacíon correcta."
     destroy: 
       success: "Autenticación eliminada."
@@ -711,15 +715,22 @@ es-AR:
     notification: 
       new: "Nueva %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "conectado a %{service}"
       manage: "gestionar servicios conectados"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Las publicaciones para \"el mundo\" podrán verse fuera de Diáspora*."
+      share: "Share"
       title: "Gesstioná los servicios conectados"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "todo"
       all_contacts: "agregar contactos"
       discard_post: "Descartar publicación"
       make_public: "hacer público"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: "Publicando..."
       publishing_to: "publicar en: "
@@ -730,6 +741,8 @@ es-AR:
     reshare: 
       reshare: "Republicar"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Me disgusta"
       hide_and_mute: "Esconder y Silenciar"
       like: "Me gusta"
@@ -761,9 +774,11 @@ es-AR:
       title: "Your Aspects"
     aspects_stream: "Aspects"
     commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+    community_spotlight_stream: "Comunidad Creativa"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ es-AR:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te hemos enviado un link de activación a %{unconfirmed_email}. Hasta que sigas este link y actives la nueva dirección, continuaremos utilizando tu dirección original %{email}."
       export_data: "Exportar datos"
+      getting_started: "New User Prefrences"
       liked: "...a alguien le gusta una publicación tuya?"
       mentioned: "...te mencionan en una publicación?"
       new_password: "Contraseña nueva"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...recibís un mensaje privado?"
       receive_email_notifications: "¿Recibir notificaciones por correo electrónico cuando..."
       reshared: "...alguien compartió tu publicación?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "¿Mostrar \"Comunidad Creativa\" en tu Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...alguien comienza a compartir con vos?"
       stream_preferences: "Stream Preferences"
       your_email: "Tu correo electrónico"
       your_handle: "Tu identificación de  Diáspora*"
     getting_started: 
-      bold: "aspectos"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "La comunidad de Diáspora está feliz de tenerte a bordo!"
-      connect_to: "Conectar a"
-      connect_to_your_other_social_networks: "Conectate con tus otras redes sociales"
-      connect_to_your_other_social_networks_explanation_p1: "Conectarte a los servicios te permitirá publicar en ellos."
-      connect_to_your_other_social_networks_explanation_p2: "Con Facebook, también podrás encontrar amigos que ya estén en Diáspora e invitar a otros."
-      connect_with_people: "Conectar con gente interesante"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Los Aspectos son una forma intuitiva de agrupar caras nuevas y familiares, privados para vos, permitiéndote filtrar o compartir fácilmente con subgrupos de tus contactos."
-      edit_profile: "Editá tu perfil"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Completá tu perfil"
-      find_friends: "Encontrar amigos"
-      find_friends_from_facebook: "encontrá tus amigos de Facebook"
-      finished: "Finalizado"
-      follow_your_interests: "Seguí tus intereses"
-      get_updates_from_core: "Recibí actualizaciones del equipo central sobre el proyecto."
       hashtag_explanation: "Los hashtags te permiten seguir y hablar sobre tus intereses. También son una gran manera de encontrar gente nueva en Diáspora."
-      not_mandatory: "Completar los siguientes pasos mejorará tu experiencia en Diáspora, pero no son obligatorios."
-      profile_description: "Facilitá que la gente te encuentre llenando tu información de perfil."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Cumpleaños"
-        gender: "Género"
-        location: "Localización"
-        name: "Nombre"
-        photo: "Foto"
-        tags: "Etiquetas"
-      search_for_hashtags: "Buscar #hashtags"
-      search_for_people: "Buscar gente"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "¡Bienvenido!"
-      welcome_with_name: "¡Bienvenido, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "en tu dispositivo móvil para acceder a Diáspora* móvil."
@@ -901,3 +896,4 @@ es-AR:
     no_person_constructed: "No pudo crearse ninguna persona a partir de esta 'hcard'."
     not_enabled: "Parece que webfinger no está habilitado para el servidor de %{account}"
     xrd_fetch_failed: "Hubo un error al buscar el 'xrd' de %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 74502c86b..85184255e 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -64,6 +64,9 @@ es-CL:
       deselect_all: "Deselect all"
       edit_aspect: "Editar %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     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: 
@@ -89,7 +92,6 @@ es-CL:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
         heading: "Conectate a Cubbi.es"
@@ -111,17 +113,17 @@ es-CL:
         need_help: "Necesitas ayuda?"
         satisfaction: "%{link}: Soporte impulsado por la comunidad"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriales,  noticias y How-to impulsados por la comunidad"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Mantén %{pod} rápido, !compra a nuestros servidores su dosis mensual de café!"
       no_contacts: "No hay contactos"
       no_tags: "+ Busca un tag para seguir"
       people_sharing_with_you: "Personas compartiendo contigo"
       post_a_message: "postea un mensaje >>"
-      see_more_from_us: "Mira más de la comunidad D*."
       services: 
         content: "Puedes enlazar los siguientes servicios a Diaspora:"
         heading: "Servicios que puedes enlazar"
       unfollow_tag: "Dejar de seguir #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -652,6 +654,8 @@ es-CL:
   search: "Buscar"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Autenticación correcta."
     destroy: 
       success: "Autenticación eliminada correctamente."
@@ -711,15 +715,22 @@ es-CL:
     notification: 
       new: "Nuevo %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "entrar a %{service}"
       manage: "manejar los servicios conectados"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Los mensajes públicos estarán disponibles para que otros fuera de Diaspora los puedan ver."
+      share: "Share"
       title: "Configurar los servicios conectados"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "todo"
       all_contacts: "todos los contactos"
       discard_post: "Descartar post"
       make_public: "hacer público"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
       publishing_to: "publicar en: "
@@ -730,6 +741,8 @@ es-CL:
     reshare: 
       reshare: "Compartir de nuevo"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "No me gusta esto"
       hide_and_mute: "Ocultar y silenciar"
       like: "Me gusta esto"
@@ -763,7 +776,9 @@ es-CL:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ es-CL:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te enviamos un link de activación a %{unconfirmed_email}. Hasta que sigas ese link y actives la nueva dirección, nosotros seguiremos usando tu dirección original %{email}."
       export_data: "Exportar Datos"
+      getting_started: "New User Prefrences"
       liked: "...a alguien le gusta tu post?"
       mentioned: "...te mencionan en un post?"
       new_password: "Nueva Contraseña"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por correo electrónico cuando..."
       reshared: "...alguien comparte tu post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...alguien comienza a compartir contigo?"
       stream_preferences: "Stream Preferences"
       your_email: "Tu correo electrónico"
       your_handle: "Tu id de diaspora"
     getting_started: 
-      bold: "aspectos"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "La comunidad de Diaspora esta feliz de tenerte abordo!"
-      connect_to: "Conectar a"
-      connect_to_your_other_social_networks: "Conectate con tus otras redes sociales"
-      connect_to_your_other_social_networks_explanation_p1: "Conectarte a los servicios te permitirá publicar en esos servicios desde acá."
-      connect_to_your_other_social_networks_explanation_p2: "Con Facebook, también seras capaz de encontrar amigos que ya estén en Diaspora e invitar a otros"
-      connect_with_people: "Conectate con gente cool"
-      connect_with_people_explanation_pt1: "Conéctate con las personas ubicándolas en uno o más de tus %{bold}"
-      connect_with_people_explanation_pt2: "Los Aspectos son la forma intuitiva de agrupar caras nuevas y familiares, de manera privada, te permiten filtrar o compartir con un subconjunto de tus contactos de manera sencilla."
-      edit_profile: "Editar perfil"
-      featured_tags: "Etiquetas destacadas"
-      fill_out_your_profile: "Rellena tu perfil"
-      find_friends: "Encuentra tus amigos"
-      find_friends_from_facebook: "encuentra amigos de Facebook"
-      finished: "¡Terminaste!"
-      follow_your_interests: "Sigue tus intereses"
-      get_updates_from_core: "Recibe actualizaciones sobre el proyecto desde el equipo central de desarrolladores"
       hashtag_explanation: "Los Hashtags te permiten hablar y seguir sobre tus intereses. También son una manera genial de encontrar nuevas personas en Diaspora."
-      not_mandatory: "Completando los siguientes pasos mejoraras tu experiencia en Diaspora, pero no son obligatorios."
-      profile_description: "Hazle mas fácil a las personas encontrarte llenando tu información de perfil."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Fecha de nacimiento"
-        gender: "Genero"
-        location: "Ubicación"
-        name: "Nombre"
-        photo: "Foto"
-        tags: "Tags"
-      search_for_hashtags: "Buscar por #hashtags"
-      search_for_people: "Buscar por persona"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "¡Bienvenido!"
-      welcome_with_name: "Bienvenido, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Ahora desde tu celular"
       on_your_mobile_device: "desde tu celular para acceder a Diaspora* móvil."
@@ -901,3 +896,4 @@ es-CL:
     no_person_constructed: "Ninguna persona puede ser construida a partir de ésta hcard"
     not_enabled: "el webfinger parece no estar disponible para el host de %{account}"
     xrd_fetch_failed: "hubo un error al recibir el crd desde la cuenta %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 29a8aa7b5..0e281f5cc 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -8,7 +8,7 @@ es:
   _comments: "Comentarios"
   _contacts: "Contactos"
   _home: "Inicio"
-  _photos: "fotos"
+  _photos: "Fotos"
   _services: "Servicios"
   account: "Cuenta"
   activerecord: 
@@ -64,6 +64,9 @@ es:
       deselect_all: "Desmarcar todos"
       edit_aspect: "Editar %{name}"
       select_all: "Marcar todos"
+    aspect_stream: 
+      stay_updated: "Mantente Actualizad@"
+      stay_updated_explanation: "Tu entrada de Novedades la forman todos tus contactos, las etiquetas que sigues, y si lo deseas, las publicaciones de diferentes miembros creativos de la comunidad."
     contacts_not_visible: "Los contactos de este aspecto no podrán verse."
     contacts_visible: "Los contactos de este aspecto podrán verse."
     create: 
@@ -89,7 +92,6 @@ es:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
-      community_spotlight: "Destacados de la Comunidad"
       cubbies: 
         explanation: "Cubbi.es es la primera aplicación de Diaspora* en desarrollo."
         heading: "Conecta con Cubbi.es"
@@ -111,17 +113,17 @@ es:
         need_help: "¿Necesitas ayuda?"
         satisfaction: "%{link}: Soporte de la Comunidad"
         tutorials_and_wiki: "%{tutorial} y %{wiki}: Tutoriales, explicaciones paso a paso y noticias de la Comunidad"
+      introduce_yourself: "Esta es tu entrada de novedades. Salta y preséntate..."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!"
       no_contacts: "No hay contactos"
       no_tags: "+ Encuentra una etiqueta a seguir"
       people_sharing_with_you: "Comparten contigo"
       post_a_message: "publica un mensaje >>"
-      see_more_from_us: "Ver más"
       services: 
         content: "Puedes conectar los siguientes servicios a Diaspora*:"
         heading: "Servicios conectados"
       unfollow_tag: "Dejar de seguir a #%{tag}"
-      welcome: "Bienvenid@"
+      welcome_to_diaspora: "¡Bienvenid@ a Diaspora, %{name}!"
       your_aspects: "Tus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -132,7 +134,7 @@ es:
       create: "Crear"
       name: "Nombre (solo tú puedes verlo)"
     no_contacts_message: 
-      community_spotlight: "destacados en la comunidad"
+      community_spotlight: "comunidad creativa"
       or_spotlight: "O tu puedes compartir con %{link}"
       try_adding_some_more_contacts: "Puedes buscar o invitar a más contactos."
       you_should_add_some_more_contacts: "¡Deberías añadir algunos contactos más!"
@@ -141,14 +143,14 @@ es:
     one: "1 aspecto"
     other: "%{count} aspectos"
     seed: 
-      acquaintances: "Conocidos"
+      acquaintances: "Conocid@s"
       family: "Familia"
       friends: "Amigos"
       work: "Trabajo"
     selected_contacts: 
       manage_your_aspects: "Gestiona tus aspectos."
       no_contacts: "Aún no tienes ningún contacto aquí."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Ver \"Comunidad Creativa\""
       view_all_contacts: "Ver todos los contactos"
     show: 
       edit_aspect: "editar aspecto"
@@ -185,8 +187,8 @@ es:
     few: "%{count} contactos"
     index: 
       add_a_new_aspect: "Añadir un nuevo aspecto"
-      add_to_aspect: "Añadir contactos a %{name}"
-      all_contacts: "Todos los Contactos"
+      add_to_aspect: "añadir contactos a %{name}"
+      all_contacts: "Todos los contactos"
       check_out: "Echa un vistazo"
       many_people_are_you_sure: "¿Estás seguro que quieres comenzar una conversación privada con más de %{suggested_limit} contactos? Publicar en sus aspectos podría ser mejor para contactar con ellos."
       my_contacts: "Mis Contactos"
@@ -202,7 +204,7 @@ es:
     sharing: 
       people_sharing: "Comparten contigo:"
     spotlight: 
-      community_spotlight: "Destacados de la Comunidad"
+      community_spotlight: "Comunidad Creativa"
     two: "%{count} contactos"
     zero: "no hay contactos"
   conversations: 
@@ -271,7 +273,7 @@ es:
     check_token: 
       not_found: "Identificación de invitación no encontrada"
     create: 
-      already_contacts: "Ya estás conectado con esa persona"
+      already_contacts: "Ya estás conectad@ con esa persona"
       already_sent: "Ya has invitado a esa persona."
       no_more: "No tienes más invitaciones."
       own_address: "No puedes enviar una invitación a tu dirección de email."
@@ -377,12 +379,12 @@ es:
       mark_all_as_read: "Marcar todo como leído"
       notifications: "Notificaciones"
     liked: 
-      few: "%{actors} les gusto tu %{post_link}."
-      many: "%{actors} les gusto tu %{post_link}."
-      one: "%{actors} le gustó tu %{post_link}."
-      other: "%{actors} les gustó tu %{post_link}."
-      two: "A %{actors} le gusta tu %{post_link}."
-      zero: "%{actors} le gustó tu %{post_link}."
+      few: "A %{actors} les gustó tu %{post_link}."
+      many: "A %{actors} les gustó tu %{post_link}."
+      one: "A %{actors} le gustó tu %{post_link}."
+      other: "A %{actors} les gustó tu %{post_link}."
+      two: "A %{actors} le gustó tu %{post_link}."
+      zero: "A %{actors} le gustó tu %{post_link}."
     liked_post_deleted: 
       few: "%{actors} les gustó una publicación eliminada."
       many: "%{actors} les gustó una publicación eliminada."
@@ -391,12 +393,12 @@ es:
       two: "%{actors} le gusta tu publicación eliminada."
       zero: "%{actors} le gustó una publicación eliminada."
     mentioned: 
-      few: "%{actors} te mencionaron en una %{post_link}."
-      many: "%{actors} te mencionaron en una %{post_link}."
+      few: "%{actors} te han mencionado en una %{post_link}."
+      many: "%{actors} te han mencionado en una %{post_link}."
       one: "%{actors} te mencionó en una %{post_link}."
-      other: "%{actors} te mencionaron en una %{post_link}."
-      two: "%{actors} te mencionó en una %{post_link}."
-      zero: "%{actors} te mencionó en una %{post_link}."
+      other: "%{actors} te han mencionado en una %{post_link}."
+      two: "%{actors} te ha mencionado en una %{post_link}."
+      zero: "%{actors} te ha mencionado en una %{post_link}."
     mentioned_deleted: 
       few: "%{actors} te mencionaron en una publicación eliminada."
       many: "%{actors} te mencionaron en una publicación eliminada."
@@ -452,7 +454,7 @@ es:
     private_message: 
       reply_to_or_view: "Responder o ver esta conversación >"
     reshared: 
-      reshared: "%{name} acaba de compartir tu publicación"
+      reshared: "%{name} compartió tu publicación"
       view_post: "Ver publicación >"
     single_admin: 
       admin: "Tu administrador Diaspora*"
@@ -652,13 +654,15 @@ es:
   search: "Buscar"
   services: 
     create: 
+      already_authorized: "Un usuario con la identidad Diaspora %{diaspora_id} ya registró esa cuenta de %{service_name}."
+      failure: "Error de acceso."
       success: "Autenticación correcta."
     destroy: 
       success: "Autenticación eliminada con éxito."
     failure: 
       error: "hubo un error conectando ese servicio"
     finder: 
-      no_friends: "No se han encontrados amigos de Facebook."
+      no_friends: "No se han encontrados amig@s de Facebook."
       service_friends: "%{service} Amigos"
     index: 
       connect_to_facebook: "Conecta con Facebook"
@@ -697,29 +701,36 @@ es:
     contact_list: 
       all_contacts: "Todos los contactos"
     footer: 
-      logged_in_as: "Conectado como %{name}"
+      logged_in_as: "conectadx como %{name}"
       your_aspects: "tus aspectos"
     invitations: 
-      by_email: "Por email"
+      by_email: "Por Email"
       dont_have_now: "No tienes invitaciones ahora mismo pero, ¡pronto llegarán más!"
       from_facebook: "Por Facebook"
       invitations_left: "%{count} restantes"
       invite_someone: "Invita a alguien"
-      invite_your_friends: "Invita a tus amigos"
+      invite_your_friends: "Invita a tus amig@s"
       invites: "Invitaciones"
       invites_closed: "Las invitaciones en este servidor Diaspora* están actualmente cerradas."
     notification: 
       new: "Nuevo %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Controla tu Audiencia"
       logged_in: "conectado a %{service}"
       manage: "gestión de servicios conectados"
+      new_user_welcome_message: "Usa #etiquetas para clasificar tus publicaciones y encontrar gente que comparte tus intereses. Llama a gente interesante con las @Menciones"
       outside: "Las publicaciones para \"el mundo\" podrán verse fuera de Diaspora*."
+      share: "Comparte"
       title: "Configurar los servicios conectados"
+      visibility_dropdown: "Usa este menú desplegable para cambiar la visibilidad de tu publicación. (Sugerimos hacerlo público la primera vez.)"
     publisher: 
       all: "todo"
       all_contacts: "todos los contactos"
       discard_post: "Descartar publicación"
       make_public: "hacer público"
+      new_user_prefill: 
+        hello: "Eih, hola a todos, soy #%{new_user_tag}."
+        i_like: "Tengo interés en %{tags}."
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: "Publicando..."
       publishing_to: "publicar en:"
@@ -730,6 +741,8 @@ es:
     reshare: 
       reshare: "Publicar en..."
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "No me gusta"
       hide_and_mute: "Ocultado y Silenciado"
       like: "Me gusta"
@@ -760,15 +773,17 @@ es:
     aspects: 
       title: "Tus Aspectos"
     aspects_stream: "Aspectos"
-    commented_on: "comentó"
-    community_spotlight_stream: "Destacados de la Comunidad"
+    commented_on: "comentado"
+    community_spotlight_stream: "Comunidad Creativa"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "Gente que sigue esas etiquetas"
+      follow: "Follow"
       title: "#Etiquetas seguidas"
     followed_tags_stream: "#Etiquetas seguidas"
     mentioned_stream: "@Menciones"
     mentions: 
-      contacts_title: "Personas que te mencionaron"
+      contacts_title: "Gente que te mencionó"
       title: "@Menciones"
     multi: 
       contacts_title: "Gente en tus Novedades"
@@ -779,7 +794,7 @@ es:
       title: "Actividad Pública"
     recently: "recientemente:"
     tags: 
-      contacts_title: "Personas que siguen esta etiqueta"
+      contacts_title: "Gente que sigue esta etiqueta"
       title: "Publicaciones etiquetadas: %{tags}"
   tag_followings: 
     create: 
@@ -794,7 +809,7 @@ es:
       followed_by: "seguido por"
       following: "Siguiendo a #%{tag}"
       nobody_talking: "Nadie esta hablando de %{tag} todavía."
-      people_tagged_with: "Personas en %{tag}"
+      people_tagged_with: "Perfiles con %{tag}"
       posts_tagged_with: "Publicaciones con #%{tag}"
       stop_following: "Dejar de seguir #%{tag}"
   tokens: 
@@ -809,12 +824,12 @@ es:
       sign_up_today: "Regístrate hoy mismo!"
       typical_userpage: "Una típica pagina de usuario de cubbi.es"
       via: "(vía %{link})"
-      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."
+      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 línea."
   undo: "¿Deshacer?"
   username: "Nombre de usuario"
   users: 
     confirm_email: 
-      email_confirmed: "Correo electrónico %{email} activado"
+      email_confirmed: "Email %{email} activado"
       email_not_confirmed: "El email no pudo ser activado. ¿Enlace erróneo?"
     destroy: "Tu cuenta ha sido bloqueada. En unos 20 minutos se cerrará totalmente. Gracias por probar Diaspora*. "
     edit: 
@@ -831,55 +846,35 @@ es:
       edit_account: "Editar cuenta"
       email_awaiting_confirmation: "Te hemos enviado un enlace de activación a %{unconfirmed_email}. Hasta que no sigas ese enlace y actives tu nueva dirección, continuaremos usando la anterior %{email}."
       export_data: "Exportar datos"
+      getting_started: "Preferencias del Nuevo Usuario"
       liked: "...a alguien le gusta tu publicación?"
-      mentioned: "...eres mencionado en una publicación?"
+      mentioned: "...eres mencionadx en una publicación?"
       new_password: "Nueva contraseña"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...recibes un mensaje privado?"
       receive_email_notifications: "Recibir notificaciones por email cuando..."
       reshared: "...alguien compartió tu publicación?"
-      show_community_spotlight: "¿Mostrar \"Destacados de la Comunidad\" en Novedades?"
+      show_community_spotlight: "¿Mostrar \"Comunidad Creativa\" en tus Novedades?"
+      show_getting_started: "Reiniciar la Introducción de Ayuda"
       started_sharing: "...alquien empieza a compartir contigo?"
       stream_preferences: "Preferencias de las Novedades"
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
-      bold: "aspectos"
-      community_spotlight: "Destacados de la Comunidad"
+      awesome_take_me_to_diaspora: "¡Increíble! Llévame a Diaspora*"
       community_welcome: "¡La comunidad de Diaspora está encantada de tenerte a bordo!"
-      connect_to: "Conectar con"
-      connect_to_your_other_social_networks: "Conecta con tus otras redes sociales"
-      connect_to_your_other_social_networks_explanation_p1: "Conectar a los servicios te permitirá compartir publicaciones con ellos."
-      connect_to_your_other_social_networks_explanation_p2: "Con Facebook también podrás encontrar amigos que ya están en Diaspora e invitar a otros."
-      connect_with_people: "Conecta con gente interesante"
-      connect_with_people_explanation_pt1: "Conecta con gente colocándola en uno o más de tus %{bold}"
-      connect_with_people_explanation_pt2: "Los Aspectos son una manera intuitiva de agrupar contactos nuevos o caras familiares, de forma privada, permitiéndote el filtrado o compartir cosas con subgrupos de entre tus contactos muy fácilmente."
-      edit_profile: "Edita tu Perfil"
-      featured_tags: "Sigue etiquetas destacadas"
-      fill_out_your_profile: "Completa tu perfil"
-      find_friends: "Descubre amigos"
-      find_friends_from_facebook: "encuentra amigos de Facebook"
-      finished: "Terminado"
-      follow_your_interests: "Sigue tus intereses"
-      get_updates_from_core: "Recibe actualizaciones sobre el proyecto del equipo central."
       hashtag_explanation: "Las etiquetas te permiten hablar sobre tus intereses así como seguirlos. Además es una forma genial de encontrar gente nueva en Diaspora. "
-      not_mandatory: "Completando los siguientes pasos mejoraras tu experiencia en Diaspora, pero no son obligatorios."
-      profile_description: "Haz más fácil encontrarte completando tu información de perfil."
-      profile_fields: 
-        bio: "Biografía"
-        birthday: "Cumpleaños"
-        gender: "Sexo"
-        location: "Ubicación"
-        name: "Nombre"
-        photo: "Foto"
-        tags: "Etiquetas"
-      search_for_hashtags: "Buscar #etiquetas"
-      search_for_people: "Buscar personas"
-      see_all_community_spotlight: "Ver todo"
-      welcome: "¡Bienvenido!"
-      welcome_with_name: "¡Bienvenido, %{name}!"
+      hashtag_suggestions: "Prueba a seguir etiquetas como #art, #cine, #gif, etc."
+      hooking_up_fb: "conecta tu cuenta de Facebook"
+      saved: "¡Guardado!"
+      we_can_speed_things_up: "Podemos acelerar las cosas un poquito mediante"
+      well_hello_there: "Bueno, ¡qué tal!"
+      what_are_you_in_to: "¿Qué andas haciendo?"
+      what_facebook_does: "a Diaspora. Esto habilitará tu nombre y tu foto, y permitirá las publicaciones cruzadas."
+      who_are_you: "¿Quién eres?"
     logged_out: 
-      go_mobile: "Ahora para móviles."
-      on_your_mobile_device: "en tu móvil para acceder a Diaspora* móvil."
+      go_mobile: "Ahora tecnología móvil."
+      on_your_mobile_device: "en tu móvil para acceder a Diaspora* mobile."
       signed_out: "Saliste de Diaspora*"
       simply_visit: "Basta con visitar"
       works_on_modern: "Funciona en todos los smartphones modernos"
@@ -901,3 +896,4 @@ es:
     no_person_constructed: "Ninguna persona pudo ser creada a partir de este hcard."
     not_enabled: "El webfinger parece no estar habilitado para el host de %{account}"
     xrd_fetch_failed: "Hubo un error al recibir el xrd desde la cuenta %{account}"
+  welcome: "¡Bienvenid@!"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 76eb032e3..51032ecd6 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -64,6 +64,9 @@ eu:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Alderdi honetako adiskideak nor dagoen bere alderdian ezingo dute ikusi."
     contacts_visible: "Alderdi honetako adiskideak jokingo dute nor dagoen alderdian."
     create: 
@@ -89,7 +92,6 @@ eu:
       aspect_not_empty: "Alderdi ez hutsa"
       remove: "ezabatu"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es garapenean dagoen lehenengo Diaspora aplikazioa da."
         heading: "Cubbi.esera lotu"
@@ -111,17 +113,17 @@ eu:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Adiskiderik ez"
       no_tags: "No tags"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Honako zerbitzuak lotu ditzakezu Diasporara:"
         heading: "Zerbitzuak Lotu"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Zure Alderdiak"
     many: "%{count} alderdi"
     move_contact: 
@@ -652,6 +654,8 @@ eu:
   search: "Bilatu"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Egiaztapena arrakastaz egina."
     destroy: 
       success: "Egiaztapena arrakastaz ezabatua."
@@ -711,15 +715,22 @@ eu:
     notification: 
       new: "%{type} berria %{from}(r)en eskutik"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "%{service}(e)n sartuta"
       manage: "kudeatu lotutako zerbitzuak"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Mezu publikoak edozeinek irakurtzeko ahalmena izango ditu, Diaspora kontua ez badu ere."
+      share: "Share"
       title: "Zerbitzu konektatuak kudeatu"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "guztiak"
       all_contacts: "adiskide guztiak"
       discard_post: "Mezua baztertu"
       make_public: "publikoa egin"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
       publishing_to: "hemen partekatzen:"
@@ -730,6 +741,8 @@ eu:
     reshare: 
       reshare: "Berriz partekatu"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Ez dut gustoko"
       hide_and_mute: "Hide and Mute"
       like: "Gustoko dut"
@@ -763,7 +776,9 @@ eu:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ eu:
       edit_account: "Kontua aldatu"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Datuak esportatu"
+      getting_started: "New User Prefrences"
       liked: "...norbaitek zure mezu bat gustoko duenean?"
       mentioned: "...mezu batean aipatzen zaituztenean?"
       new_password: "Pasahitz Berria"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...mezu pribatu bat jasotzen duzunean?"
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...norbaitek zurekin harreman berria hasten duenean?"
       stream_preferences: "Stream Preferences"
       your_email: "Zure e-posta"
       your_handle: "Zure Diaspora IDa"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Zure profila aldatu"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Bukatua!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Ongi Etorri Diasporara!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ eu:
     no_person_constructed: "Ezin izan da pertsona sortu hcard erabiliz."
     not_enabled: "webfinger ez dago aktibatuta %{account} zerbitzariarengatik"
     xrd_fetch_failed: "akatsa sortu da %{account}(e)tik xrd lortzean"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index a5ee2f8a6..b7fa5fb30 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -64,6 +64,9 @@ fi:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontaktit tässä näkymässä eivät voi nähdä toisiaan."
     contacts_visible: "Kontaktit tässä näkymässä voivat nähdä toisensa."
     create: 
@@ -89,7 +92,6 @@ fi:
       aspect_not_empty: "Näkymä ei ole tyhjä"
       remove: "poista"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es on ensimmäinen kehitettävä Diaspora -sovellus."
         heading: "Yhdistä Cubbi.es:iin"
@@ -111,17 +113,17 @@ fi:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ei kontakteja"
       no_tags: "No tags"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
       post_a_message: "lähetä viesti >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Voit yhdistää Diasporaan seuraavat palvelut:"
         heading: "Yhdistä palveluihin"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Näkymäsi"
     many: "%{count} näkymää"
     move_contact: 
@@ -652,6 +654,8 @@ fi:
   search: "Etsi"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Tunnistus onnistui."
     destroy: 
       success: "Tunnistuksen poisto onnistui."
@@ -711,15 +715,22 @@ fi:
     notification: 
       new: "Uusi %{type} henkilöltä %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "sisäänkirjautunut palveluun %{service}"
       manage: "hallitse yhdistettyjä palveluita"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Julkiset viestit näkyvät Diasporan ulkopuolelle."
+      share: "Share"
       title: "Olet lähettämässä julkista viestiä!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
       discard_post: "Hylkää viesti"
       make_public: "tee julkiseksi"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       publishing_to: "Julkaistaan: "
@@ -730,6 +741,8 @@ fi:
     reshare: 
       reshare: "Jaa uudelleen"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "En tykkää"
       hide_and_mute: "Hide and Mute"
       like: "Tykkää"
@@ -763,7 +776,9 @@ fi:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ fi:
       edit_account: "Muokkaa käyttäjätiliä"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Vie tietoja"
+      getting_started: "New User Prefrences"
       liked: "...tykkää kirjoituksistasi?"
       mentioned: "...sinut mainitaan viestissä?"
       new_password: "Uusi salasana"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...saat uuden viestin?"
       receive_email_notifications: "Vastaanota sähköposti-ilmoituksia, kun.."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...aloittaa jakamaan kanssasi?"
       stream_preferences: "Stream Preferences"
       your_email: "Sähköpostiosoitteesi"
       your_handle: "Diaspora-tunnuksesi"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Yhdistä"
-      connect_to_your_other_social_networks: "Yhdistä muihin sosiaalisen median verkostoihisi"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Muokkaa profiiliasi"
-      featured_tags: "Valikoidut tagit"
-      fill_out_your_profile: "Täytä profiilisi"
-      find_friends: "Etsi ystäviä"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Valmis!"
-      follow_your_interests: "Seuraa mielenkiinnon kohteitasi"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtagit mahdollistavat kiinnostuksen kohteistasi keskustelun ja niiden seuraamisen. Ne ovat myös hyvä keino ihmisten löytämiseen Diasporassa."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Täytä profiilisi, että ihmisten on helpompi löytää sinut."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Syntymäpäivä"
-        gender: "Sukupuoli"
-        location: "Sijainti"
-        name: "Nimi"
-        photo: "Kuva"
-        tags: "Tagit"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Tervetuloa Diasporaan!"
-      welcome_with_name: "Tervetuloa, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ fi:
     no_person_constructed: "Yhtäkään henkilöä ei pystytty kokoamaan tältä hcard:ilta."
     not_enabled: "webfinger-palvelua ei ilmeisesti ole aktivoitu tilin, %{account}, isännälle"
     xrd_fetch_failed: "tapahtui virhe haettaessa xrd:tä käyttäjätilille %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 8464a44cb..118831142 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -29,7 +29,7 @@ fr:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "Vous avez déjà repartagé ce message !"
+              taken: "C'est bon, hein ? Vous avez déjà repartagé ce message !"
         user: 
           attributes: 
             email: 
@@ -64,6 +64,9 @@ fr:
       deselect_all: "Tout désélectionner"
       edit_aspect: "Éditer %{name}"
       select_all: "Tout sélectionner"
+    aspect_stream: 
+      stay_updated: "Restez informés"
+      stay_updated_explanation: "Votre flux principal est completé par vos contacts, vos tags suivis, et les messages de certains membres de la communauté."
     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: 
@@ -89,7 +92,6 @@ fr:
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
-      community_spotlight: "Actualités de la communauté"
       cubbies: 
         explanation: "Cubbi.es est la première application Diaspora en cours de développement."
         heading: "Connectez-vous à Cubbi.es"
@@ -111,17 +113,17 @@ fr:
         need_help: "Besoin d'aide ?"
         satisfaction: "%{link} : Support par la communauté"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriels, notes et actualité de la comunauté"
+      introduce_yourself: "Ceci est votre flux. Rejoignez-nous et présentez-vous."
       keep_us_running: "Permettez à %{pod} de fonctionner rapidement et achetez une dose de café par mois à nos serveurs !"
       no_contacts: "Aucun contact"
       no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
       post_a_message: "publier un message >>"
-      see_more_from_us: "Voir plus de la communauté D*."
       services: 
         content: "Vous pouvez connecter les services suivants à Diaspora :"
         heading: "Services connectés"
       unfollow_tag: "Arrêter de suivre #%{tag}"
-      welcome: "Bienvenue"
+      welcome_to_diaspora: "Bienvenue sur Diaspora*, %{name} !"
       your_aspects: "Vos aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -148,7 +150,7 @@ fr:
     selected_contacts: 
       manage_your_aspects: "Gérer vos aspects."
       no_contacts: "Vous n'avez encore aucun contact."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Voir toutes les actualités de la communauté"
       view_all_contacts: "Afficher tous les contacts"
     show: 
       edit_aspect: "modifier l'aspect"
@@ -185,7 +187,7 @@ fr:
     few: "%{count} contacts"
     index: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
-      add_to_aspect: "Ajouter les contacts à %{name}"
+      add_to_aspect: "ajouter les contacts à %{name}"
       all_contacts: "Tous les contacts"
       check_out: "Vérifiez"
       many_people_are_you_sure: "Êtes-vous sûr de vouloir commencer une conversation privée avec plus de %{suggested_limit} contacts? Envoyer des messages à cet aspect peut être un meilleur moyen de les contacter."
@@ -377,12 +379,12 @@ fr:
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
     liked: 
-      few: "%{actors} a/ont aimé votre %{post_link}."
-      many: "%{actors} a/ont aimé votre %{post_link}."
-      one: "%{actors} a/ont aimé votre %{post_link}."
-      other: "%{actors} a/ont aimé votre %{post_link}."
-      two: "%{actors} viennent d'aimer votre %{post_link}."
-      zero: "%{actors} a/ont aimé votre %{post_link}."
+      few: "%{actors} ont aimé votre %{post_link}."
+      many: "%{actors} ont aimé votre %{post_link}."
+      one: "%{actors} a aimé votre %{post_link}."
+      other: "%{actors} ont aimé votre %{post_link}."
+      two: "%{actors} ont aimé votre %{post_link}."
+      zero: "%{actors} n'a aimé votre %{post_link}."
     liked_post_deleted: 
       few: "%{actors} a aimé votre message supprimé."
       many: "%{actors} a aimé votre message supprimé."
@@ -391,12 +393,12 @@ fr:
       two: "%{actors} aiment le message que vous avez supprimé."
       zero: "%{actors} a aimé votre message supprimé."
     mentioned: 
-      few: "%{actors} vous a mentionné(e) dans un %{post_link}."
-      many: "%{actors} vous a mentionné(e) dans un %{post_link}."
+      few: "%{actors} vous ont mentionné(e) dans un %{post_link}."
+      many: "%{actors} vous ont mentionné(e) dans un %{post_link}."
       one: "%{actors} vous a mentionné(e) dans un %{post_link}."
-      other: "%{actors} vous a mentionné(e) dans un %{post_link}."
-      two: "%{actors} a parlé de vous dans %{post_link}."
-      zero: "%{actors} vous a mentionné(e) dans un %{post_link}."
+      other: "%{actors} vous ont mentionné(e) dans un %{post_link}."
+      two: "%{actors} ont parlé de vous dans %{post_link}."
+      zero: "%{actors} vous ont mentionné(e) dans un %{post_link}."
     mentioned_deleted: 
       few: "%{actors} vous a mentionné dans un message supprimé."
       many: "%{actors} vous a mentionné dans un message supprimé."
@@ -413,12 +415,12 @@ fr:
       two: "%{actors} vous ont envoyé un message."
       zero: "%{actors} vous a envoyé un message."
     reshared: 
-      few: "%{actors} a repartagé votre %{post_link}."
-      many: "%{actors} a repartagé votre %{post_link}."
+      few: "%{actors} ont repartagé votre %{post_link}."
+      many: "%{actors} ont repartagé votre %{post_link}."
       one: "%{actors} a repartagé votre %{post_link}."
-      other: "%{actors} a repartagé votre %{post_link}."
+      other: "%{actors} ont repartagé votre %{post_link}."
       two: "%{actors} ont partagé votre %{post_link}."
-      zero: "%{actors} a repartagé votre %{post_link}."
+      zero: "%{actors} ont repartagé votre %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} a partagé le message que vous avez supprimé."
       many: "%{actors} ont partagé le message que vous avez supprimé."
@@ -452,7 +454,7 @@ fr:
     private_message: 
       reply_to_or_view: "Répondre ou voir cette conversation >"
     reshared: 
-      reshared: "%{name} vient de repartager votre message"
+      reshared: "%{name} a repartagé votre message"
       view_post: "Voir le message >"
     single_admin: 
       admin: "Votre administrateur Diaspora"
@@ -610,7 +612,7 @@ fr:
       enter_password_again: "Saisissez à nouveau le même mot de passe"
       enter_username: "Choisissez un nom d'utilisateur (uniquement des lettres, chiffres et caractères de soulignement)"
       join_the_movement: "Rejoignez le mouvement !"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Le réseau social avec un <3"
   requests: 
     create: 
       sending: "En cours d'envoi"
@@ -652,6 +654,8 @@ fr:
   search: "Rechercher"
   services: 
     create: 
+      already_authorized: "Un utilisateur dont l'id diaspora est %{diaspora_id} a déjà autorisé ce compte %{service_name}."
+      failure: "L'authentification a échouée."
       success: "Authentification réussie."
     destroy: 
       success: "Authentification supprimée."
@@ -711,15 +715,22 @@ fr:
     notification: 
       new: "Nouveau/nouvelle %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Contrôlez votre audience"
       logged_in: "connecté(e) à %{service}"
       manage: "gérer les services connectés"
+      new_user_welcome_message: "Utilisez les #tags pour classer vos messages et trouver des personnes qui partagent vos intérêts. Appelez des personnes impressionnantes avec les @Mentions"
       outside: "Les messages publics pourront être vus par d'autres en dehors de Diaspora."
+      share: "Partager"
       title: "Mettre en place des services connectés"
+      visibility_dropdown: "Utilisez ce menu déroulant pour modifier la visibilité de votre messages. (Nous vous conseillons de faire ce premier message public)"
     publisher: 
       all: "tous"
       all_contacts: "tous les contacts"
       discard_post: "Supprimer la publication"
       make_public: "rendre public"
+      new_user_prefill: 
+        hello: "Bonjour tout le monde, je suis #%{new_user_tag}. "
+        i_like: "Je suis intéressé par %{tags}."
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
       publishing_to: "publication vers : "
@@ -730,6 +741,8 @@ fr:
     reshare: 
       reshare: "Repartager"
     stream_element: 
+      connect_to_comment: "Ajoutez cet utilisateur pour commenter son message"
+      currently_unavailable: "les commentaires sont actuellement indisponible"
       dislike: "Je n'aime pas"
       hide_and_mute: "Masquer et mettre en sourdine"
       like: "J'aime"
@@ -760,10 +773,12 @@ fr:
     aspects: 
       title: "Vos Aspects"
     aspects_stream: "Aspects"
-    commented_on: "commented on"
+    commented_on: "commenté"
     community_spotlight_stream: "Actualités de la communauté"
     followed_tag: 
+      add_a_tag: "Ajouter un tag"
       contacts_title: "Personnes qui suivent ces tags"
+      follow: "Suivre"
       title: "#Tags Suivis"
     followed_tags_stream: "#Tags Suivis"
     mentioned_stream: "@Mentions"
@@ -783,8 +798,8 @@ fr:
       title: "Messages tagués : %{tags}"
   tag_followings: 
     create: 
-      failure: "Erreur lors de la demande de suivi de : #%{name}"
-      success: "Le suivi de #%{name} est un succès"
+      failure: "Erreur lors de la demande de suivi de #%{name}. Le suivez-vous déjà ?"
+      success: "Yep ! Vous suivez maintenant #% {name}."
     destroy: 
       failure: "Erreur lors de la demande d'arrêt du suivit de : #%{name}"
       success: "L'arrêt du suivit de #%{name} est un succès"
@@ -831,52 +846,32 @@ fr:
       edit_account: "Modifier le compte"
       email_awaiting_confirmation: "Nous vous avons envoyé un lien d'activation à %{unconfirmed_email}. Jusqu'à ce que vous suivez ce lien et activez la nouvelle adresse, nous allons continuer à utiliser votre adresse originale %{email}."
       export_data: "Exporter des données"
+      getting_started: "Préférences de nouvel utilisateur"
       liked: "...quelqu'un aime votre message ?"
       mentioned: "…vous êtes mentionné(e) dans une publication ?"
       new_password: "Nouveau mot de passe"
+      photo_export_unavailable: "L'exportation des photos est actuellement indisponible"
       private_message: "…vous recevez un message privé ?"
       receive_email_notifications: "Recevoir des notifications par courrier électronique lorsque…"
       reshared: "...quelqu'un a partagé votre message ?"
       show_community_spotlight: "Afficher les actualités de la communauté dans votre Flux ?"
+      show_getting_started: "Réactiver la page de découverte"
       started_sharing: "...quelqu'un commence à partager avec vous ?"
       stream_preferences: "Préférences du Flux"
       your_email: "Votre adresse électronique"
       your_handle: "Votre identifiant diaspora"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Actualités de la communauté"
+      awesome_take_me_to_diaspora: "Impressionnant ! Offrez-moi Diaspora*"
       community_welcome: "La communauté Diaspora* est heureuse de vous avoir à bord !"
-      connect_to: "Connectez-vous à"
-      connect_to_your_other_social_networks: "Connectez-vous à vos autres réseaux sociaux"
-      connect_to_your_other_social_networks_explanation_p1: "Connexion à des services qui vous permettront de diffuser vos publications."
-      connect_to_your_other_social_networks_explanation_p2: "Avec Facebook, vous pouvez également être en mesure de trouver des amis déjà sur Diaspora* et inviter d'autres personnes."
-      connect_with_people: "Connectez-vous avec des gens cool"
-      connect_with_people_explanation_pt1: "Connectez-vous avec des gens en les plaçant dans un ou plusieurs de vos %{gras}."
-      connect_with_people_explanation_pt2: "Les aspects sont un moyen intuitif de grouper les visages familiers et nouveaux, privés, vous permettant de filtrer ou partager avec des sous-ensembles de vos contacts facilement."
-      edit_profile: "Editer le profil"
-      featured_tags: "Suivre des tags recommandés"
-      fill_out_your_profile: "Remplissez votre profil"
-      find_friends: "Trouver des amis"
-      find_friends_from_facebook: "trouver des amis de Facebook"
-      finished: "Terminé"
-      follow_your_interests: "Suivez vos intérêts"
-      get_updates_from_core: "Obtenez les actualités sur le projet depuis l'équipe."
       hashtag_explanation: "Les tags vous permettre de parler et de suivre vos intérêts. Ils sont aussi un excellent moyen de trouver de nouvelles personnes sur Diaspora."
-      not_mandatory: "Compléter les étapes suivantes permettra d'améliorer votre expérience de Diaspora*, mais elles ne sont pas obligatoires."
-      profile_description: "Permettez aux gens de vous trouver plus facilement en remplissant vos informations de profil."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Anniversaire"
-        gender: "Sexe"
-        location: "Localisation"
-        name: "Nom"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Chercher #tag"
-      search_for_people: "Rechercher des personnes"
-      see_all_community_spotlight: "Voir toutes les actualités de la communauté"
-      welcome: "Bienvenue !"
-      welcome_with_name: "Bienvenue, %{name} !"
+      hashtag_suggestions: "Essayez de suivre des tags comme #art, #films, #french, etc."
+      hooking_up_fb: "connectant votre compte Facebook"
+      saved: "Sauvé !"
+      we_can_speed_things_up: "Nous pouvons un peu accélérer les choses en"
+      well_hello_there: "Eh bien, bonjour !"
+      what_are_you_in_to: "Qu'aimez-vous faire ?"
+      what_facebook_does: "à Diaspora*. Ça permettra d'importer votre nom et votre photo, et aussi d'y publier vos messages."
+      who_are_you: "Qui êtes-vous ?"
     logged_out: 
       go_mobile: "Maintenant sur mobiles."
       on_your_mobile_device: "sur votre mobile pour accéder à Diaspora*."
@@ -901,3 +896,4 @@ fr:
     no_person_constructed: "Cette hcard semble être invalide."
     not_enabled: "webfinger ne semble pas être activé sur l'hôte de %{account}'s"
     xrd_fetch_failed: "une erreur est survenue lors de la récupération du xrd du compte %{account}"
+  welcome: "Bienvenue !"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 34c7c6c2b..2ab3cd66b 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -64,6 +64,9 @@ ga:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ ga:
       aspect_not_empty: "Níl an gné folamh"
       remove: "bhain"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ ga:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ ga:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "D'éirigh leis an fíordheimhniú"
     destroy: 
       success: "D'éirigh le scriose and fíordheimhniú"
@@ -711,15 +715,22 @@ ga:
     notification: 
       new: "%{type} nua ó %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logáilte isteach chuig %{service}"
       manage: "bainistiú seirbhísí ceangailte"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Tá daoine taobh amuigh de Diaspora abálta teachtaireacht phoiblí a fheiceáil."
+      share: "Share"
       title: "Tá tú díreach chun teachtaireacht phoíblí a póstáil!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "gach rud"
       all_contacts: "gach teagmháil"
       discard_post: "Discard post"
       make_public: "dean phoiblí"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ ga:
     reshare: 
       reshare: "Roinn arís"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ ga:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ ga:
       edit_account: "Athraigh cúntas"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Easpórtáil Sonraí"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Pasfhocal nua"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Fháil fógraí ríomhphost?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Do seola ríomhphost"
       your_handle: "Do hanla diaspora"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Athraigh do próifíl"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Críochnaithe!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome to Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ ga:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "bhí fadbh ag fháil an xrd ón cúntas %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 9b77f53b5..cd85dc49a 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -64,6 +64,9 @@ he:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "אנשי הקשר בהיבט זה לא יוכלו לראות אחד את השני."
     contacts_visible: "אנשי קשר בהיבט זה יוכלו לראות זה את זה."
     create: 
@@ -89,7 +92,6 @@ he:
       aspect_not_empty: "ההיבט אינו ריק"
       remove: "הסרה"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es הנו היישום הראשון תחת דיאספורה הנמצא בפיתוח."
         heading: "התחברות ל־Cubbi.es"
@@ -111,17 +113,17 @@ he:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "כדי שהפוד %{pod} ימשיך לפעול במהירות ולרכוש שרתים נוספים שימו כמה דולרים כל חודש כדי לממן להם איזה כוס קפה!"
       no_contacts: "אין אנשי קשר"
       no_tags: "+ חיפוש תגית למעקב"
       people_sharing_with_you: "אנשים המשתפים אתך"
       post_a_message: "פרסום הודעה >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "ניתן לקשר את השירותים הבאים לדיאספורה:"
         heading: "שירותים מקושרים"
       unfollow_tag: "הפסקת המעקב אחר #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "ההיבטים שלך"
     many: "%{count} היבטים"
     move_contact: 
@@ -652,6 +654,8 @@ he:
   search: "חיפוש"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "האימות הצליח."
     destroy: 
       success: "האימות נמחק בהצלחה."
@@ -711,15 +715,22 @@ he:
     notification: 
       new: "%{type} חדש מאת %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "נכנסת אל %{service}"
       manage: "ניהול השירותים המקושרים"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "ההודעות הציבוריות יהיו זמינות לצפייה חיצונית גם מחוץ לרשת דיאספורה."
+      share: "Share"
       title: "הגדרת שירותים מקושרים"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "הכול"
       all_contacts: "כל אנשי הקשר"
       discard_post: "התעלמות מרשומה"
       make_public: "הפיכה לציבורי"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
       publishing_to: "פרסום אל:"
@@ -730,6 +741,8 @@ he:
     reshare: 
       reshare: "שיתוף מחדש"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "לא אהבתי את זה"
       hide_and_mute: "Hide and Mute"
       like: "אהבתי"
@@ -763,7 +776,9 @@ he:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ he:
       edit_account: "עריכת החשבון"
       email_awaiting_confirmation: "שלחנו אליך קישור הפעלה לכתובת %{unconfirmed_email}.עד שתעקוב אחר קישור זה ותפעיל את הכתובת החדשה, אנו נמשיך להשתמש בכתובת המקורית שלך: %{email}."
       export_data: "יצוא הנתונים"
+      getting_started: "New User Prefrences"
       liked: "...מישהו אהב את הרשומה שלך?"
       mentioned: "...מישהו ציין אותך ברשומה?"
       new_password: "ססמה חדשה"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...קיבלת הודעה פרטית?"
       receive_email_notifications: "לקבל התרעות בדוא״ל כאשר..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...מישהו התחיל לשתף אתך?"
       stream_preferences: "Stream Preferences"
       your_email: "כתובת הדוא״ל שלך"
       your_handle: "שם המשתמש שלך בדיאספורה"
     getting_started: 
-      bold: "היבטים"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "התחברות אל"
-      connect_to_your_other_social_networks: "התחברות לרשתות החברתיות הנוספות שלך"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "התחברות לאנשים מגניבים"
-      connect_with_people_explanation_pt1: "ניתן ליצור קשר עם אנשים על ידי הצבתם באחד או יותר מה%{bold} שלך."
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "עריכת הפרופיל"
-      featured_tags: "מעקב אחר תגיות מומלצות"
-      fill_out_your_profile: "מומלץ למלא את הפרופיל שלך"
-      find_friends: "חיפוש חברים"
-      find_friends_from_facebook: "חיפוש חברים מפייסבוק"
-      finished: "הסתיים"
-      follow_your_interests: "מעקב אחר התחומים המעניינים אותך"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "תגיות מאפשרות לך לשוחח על ולעקוב אחר תחומי העניין שלך. זוהי גם דרך מצוינת למצוא אנשים בדיאספורה."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "כדי לדאוג שלאנשים יהיה קל יותר לאתר אותך מומלץ למלא את פרטי הפרופיל שלך."
-      profile_fields: 
-        bio: "ביוגרפיה"
-        birthday: "יום הולדת"
-        gender: "מגדר"
-        location: "מיקום"
-        name: "שם"
-        photo: "תמונה"
-        tags: "תגיות"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "ברוך בואך!"
-      welcome_with_name: "ברוך בואך, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ he:
     no_person_constructed: "לא ניתן להרכיב איש קשר מ־hcard זה."
     not_enabled: "נראה כי webfinger אינו פעיל עבור המארח של %{account}"
     xrd_fetch_failed: "אירעה שגיאה בקבלת ה־xrd מהחשבון %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 85c115f4d..84d34dc6b 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -64,6 +64,9 @@ hu:
       deselect_all: "Összes kijelölés törlése"
       edit_aspect: "Szerkesztés %{name}"
       select_all: "Mindent kijelöl"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "A csoporttagok nem láthatják egymást."
     contacts_visible: "A csoport tagjai láthatják egymást."
     create: 
@@ -89,7 +92,6 @@ hu:
       aspect_not_empty: "A csoport nem üres"
       remove: "eltávolítás"
     index: 
-      community_spotlight: "A figyelem középpontjában"
       cubbies: 
         explanation: "Cubbi.es az első fejlesztés alatt álló Diaspora applikáció."
         heading: "Kapcsolódás: Cubbi.es"
@@ -111,17 +113,17 @@ hu:
         need_help: "Segítségre van szüksége?"
         satisfaction: "%{link}: Közösségi támogatás"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: A közösségi által nyújtott ismertetők és hírek"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Hogy gyors maradjon ez a pod (%{pod}), kérlek adományozz pénzt."
       no_contacts: "Nincs ismerős"
       no_tags: "+ #címke keresése"
       people_sharing_with_you: "Ismerőseid"
       post_a_message: "üzenet küldése >>"
-      see_more_from_us: "Tudj meg többet a D* közösségről."
       services: 
         content: "A következő szolgáltatásokhoz tudsz kapcsolódni:"
         heading: "Összekapcsolt szolgáltatások"
       unfollow_tag: "Követés leállítása #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Csoportjaid"
     many: "%{count} csoport"
     move_contact: 
@@ -652,6 +654,8 @@ hu:
   search: "Keresés"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "A hitelesítés sikeres."
     destroy: 
       success: "Sikeresen megsemmisítetted a kapcsolódást."
@@ -711,15 +715,22 @@ hu:
     notification: 
       new: "Új %{type} %{from}-tól/től"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "bejelentkezve ide: %{service}"
       manage: "kapcsolódó szolgáltatások kezelése"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "A publikus üzeneteket a Diaspora-n kívüli személyek is láthatják."
+      share: "Share"
       title: "Kapcsolódó szolgáltatások beállítása"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "összes"
       all_contacts: "összes kapcsolat"
       discard_post: "Bejegyzés elvetése"
       make_public: "nyilvánossá tesz"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
       publishing_to: "Publikálás:"
@@ -730,6 +741,8 @@ hu:
     reshare: 
       reshare: "Újraosztás"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Nem tetszik"
       hide_and_mute: "Elrejt és elnémít"
       like: "Tetszik"
@@ -763,7 +776,9 @@ hu:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ hu:
       edit_account: "Fiók szerkesztése"
       email_awaiting_confirmation: "Aktivációs link elküldve ide: %{unconfirmed_email}. Amíg nem erősíted meg az új címed, addig a régit használjuk: %{email}."
       export_data: "Adatok exportálása"
+      getting_started: "New User Prefrences"
       liked: "... valakinek tetszik a bejegyzésed?"
       mentioned: "...meg vagy említve egy bejegyzésben?"
       new_password: "Új jelszó"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...privát üzenetet kaptál?"
       receive_email_notifications: "Email értesítést kérek amikor..."
       reshared: "...valaki újraosztotta a bejegyzésedet?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...valaki megoszt veled?"
       stream_preferences: "Stream Preferences"
       your_email: "E-mail címed"
       your_handle: "Diaspora azonosítód"
     getting_started: 
-      bold: "csoportok"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "A Diaspora közösség üdvözöl a fedélzeten!"
-      connect_to: "Kapcsolódás"
-      connect_to_your_other_social_networks: "Kapcsolódj más közösségi hálókhoz is"
-      connect_to_your_other_social_networks_explanation_p1: "Külső szolgáltatásokhoz való kapcsolódással rajtuk is közzétehetsz tartalmakat."
-      connect_to_your_other_social_networks_explanation_p2: "A Facebook segítségével is megtalálhatod a Diaspora hálózaton lévő ismerőseidet és meghívhatsz másokat is."
-      connect_with_people: "Lépj kapcsolatba király emberekkel"
-      connect_with_people_explanation_pt1: "Maradj kapcsolatban az emberekkel. Helyezd őket egy vagy több csoportba."
-      connect_with_people_explanation_pt2: "A csoportokkal könnyen beoszthatod az ismerőseidet, kikkel mit szeretnél megosztani."
-      edit_profile: "Profil szerkesztése"
-      featured_tags: "Kiemelt címkék követése"
-      fill_out_your_profile: "Töltsd ki a profilod"
-      find_friends: "Keresd meg a barátaid"
-      find_friends_from_facebook: "találj ismerősöket Facebook-ról"
-      finished: "Kész!"
-      follow_your_interests: "Kövesd az érdekes témákat"
-      get_updates_from_core: "Kapj friss híreket a projekttel kapcsolatban a központi fejlesztői csapattól."
       hashtag_explanation: "A #címkék segítenek egy bizonyos téma megtalálásában, így akár új kapcsolatokra is szert tehetsz."
-      not_mandatory: "A következő lépések nem kötelezőek, de jobbá teszik a felhasználói élményt."
-      profile_description: "Töltsd ki a profil információkat, hogy ismerőseid könnyebben megtaláljanak."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Születésnap"
-        gender: "Nem"
-        location: "Hely"
-        name: "Név"
-        photo: "Fénykép"
-        tags: "Címkék"
-      search_for_hashtags: "Keresés #hashtags"
-      search_for_people: "Ismerősök keresése"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Üdv!"
-      welcome_with_name: "Üdv, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Maradj kapcsolatban."
       on_your_mobile_device: "a mobiltelefonodon, hogy hozzáférj a Diaspora* mobil verzióhoz."
@@ -901,3 +896,4 @@ hu:
     no_person_constructed: "Ebből a hCard névjegyből nem lehet személyt létrehozni."
     not_enabled: "a webfinger nincs engedélyezve %{account} kiszolgálóján"
     xrd_fetch_failed: "%{account} fiókjából nem sikerült az XRD kiolvasása"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 0a3d17a6a..4aa3b4fd3 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -64,6 +64,9 @@ id:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ id:
       aspect_not_empty: "Aspek tidak kosong"
       remove: "hapus"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ id:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ id:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully destroyed authentication."
@@ -711,15 +715,22 @@ id:
     notification: 
       new: "%{type} baru dari %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "You are about to post a public message!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "all"
       all_contacts: "all contacts"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ id:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ id:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ id:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finished!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome to Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ id:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 23681214b..d1716fcb6 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -64,6 +64,9 @@ is:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Tengiliðir í þessari ásýnd geta ekki séð hvern annan."
     contacts_visible: "Tengiliðir í þessari ásýnd geta séð hvern annan."
     create: 
@@ -89,7 +92,6 @@ is:
       aspect_not_empty: "Ásýnd er ekki tóm"
       remove: "fjarlægja"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ is:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Engir tengiliðir"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ is:
   search: "Leita"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Auðkenning tókst."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ is:
     notification: 
       new: "Nýtt %{type} frá %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Almennt aðgengileg skilaboð verða sýnileg öðrum utan Diaspora."
+      share: "Share"
       title: "Þú ert að fara að setja þetta á almannafæri!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "allt"
       all_contacts: "Allir tengiliðir"
       discard_post: "Discard post"
       make_public: "gera almennt"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: "Senda..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ is:
     reshare: 
       reshare: "Endurdeila"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ is:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ is:
       edit_account: "Breyta notandastillingum"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Nýtt lykilorð"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Fá tilkynningar í tölvupósti?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Netfangið þitt"
       your_handle: "Díaspora netfangið þitt."
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Breyta síðunni þinni"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Búið!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Velkomin(n) í Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ is:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index c45b8c05f..c72647aad 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -64,6 +64,9 @@ it:
       deselect_all: "Deseleziona tutti"
       edit_aspect: "Modifica %{name}"
       select_all: "Seleziona tutti"
+    aspect_stream: 
+      stay_updated: "Segui lo stream"
+      stay_updated_explanation: "Lo stream è popolato da tutti i tuoi contatti, dai tag che segui e dai post di alcuni membri della comunità particolarmente creativi."
     contacts_not_visible: "I contatti in questo aspetto non potranno vedersi tra loro."
     contacts_visible: "I contatti in questo aspetto potranno vedersi tra loro."
     create: 
@@ -89,7 +92,6 @@ it:
       aspect_not_empty: "Aspetto non vuoto"
       remove: "rimuovi"
     index: 
-      community_spotlight: "In evidenza dalla comunità"
       cubbies: 
         explanation: "Cubbi.es è la prima applicazione in sviluppo per Diaspora."
         heading: "Connettiti a Cubbi.es"
@@ -111,17 +113,17 @@ it:
         need_help: "Hai bisogno di aiuto?"
         satisfaction: "%{link}: Per avere supporto dalla comunità"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Per le ultime notizie, le guide e i suggerimenti della comunità"
+      introduce_yourself: "Questo è il tuo stream. Sali a bordo e presentati."
       keep_us_running: "Mantieni %{pod} veloce e scattante, la tua donazione mensile sarà il caffè per i nostri server!"
       no_contacts: "Nessun contatto"
       no_tags: "+ Cerca tag da seguire"
       people_sharing_with_you: "Persone in condivisione con te"
       post_a_message: "invia un messaggio >>"
-      see_more_from_us: "Scopri gli altri della comunità."
       services: 
         content: "Puoi collegare i seguenti servizi a Diaspora:"
         heading: "Servizi connessi"
       unfollow_tag: "Smetti di seguire #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Diaspora ti dà il benvenuto, %{name}!"
       your_aspects: "I tuoi aspetti"
     many: "%{count} aspetti"
     move_contact: 
@@ -132,9 +134,9 @@ it:
       create: "Crea"
       name: "Nome (visibile solo a te)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Puoi cercare (in alto) o invitare altri contatti (a destra)."
+      community_spotlight: "In evidenza dalla comunità"
+      or_spotlight: "Oppure puoi condividere con %{link}"
+      try_adding_some_more_contacts: "Puoi cercare o invitare altri contatti."
       you_should_add_some_more_contacts: "Dovresti aggiungere qualche altro contatto!"
     no_posts_message: 
       start_talking: "Ancora nessuno ha scritto nulla. Inizia la conversazione!"
@@ -148,7 +150,7 @@ it:
     selected_contacts: 
       manage_your_aspects: "Amministra gli aspetti della tua vita"
       no_contacts: "Ancora non hai contatti."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Tutte le persone in evidenza"
       view_all_contacts: "Visualizza tutti i contatti"
     show: 
       edit_aspect: "modifica aspetto"
@@ -185,7 +187,7 @@ it:
     few: "%{count} contatti"
     index: 
       add_a_new_aspect: "Aggiungi un aspetto"
-      add_to_aspect: "Aggiungi i contatti a %{name}"
+      add_to_aspect: "aggiungi i contatti a %{name}"
       all_contacts: "Tutti i contatti"
       check_out: "Check out"
       many_people_are_you_sure: "Stai inviando un messaggio privato a più di %{suggested_limit} contatti. Vuoi farlo davvero? Forse potrebbe essere più opportuno pubblicarlo su un aspetto!"
@@ -377,12 +379,12 @@ it:
       mark_all_as_read: "Segna tutti come letti"
       notifications: "Notifiche"
     liked: 
-      few: "%{actors} hanno apprezzato il tuo %{post_link}."
-      many: "%{actors} hanno apprezzato il tuo %{post_link}."
-      one: "%{actors} ha apprezzato il tuo %{post_link}."
-      other: "%{actors} ha apprezzato il tuo %{post_link}."
+      few: "A %{actors} piace il tuo %{post_link}."
+      many: "A %{actors} piace il tuo %{post_link}."
+      one: "A %{actors} piace il tuo %{post_link}."
+      other: "A %{actors} piace il tuo %{post_link}."
       two: "A %{actors} piace il tuo %{post_link}."
-      zero: "%{actors} ha apprezzato il tuo %{post_link}."
+      zero: "A %{actors} piace il tuo %{post_link}."
     liked_post_deleted: 
       few: "A %{actors} piaceva il messaggio che hai eliminato."
       many: "A %{actors} piaceva il messaggio che hai eliminato."
@@ -394,9 +396,9 @@ it:
       few: "%{actors} ti hanno menzionato in un %{post_link}."
       many: "%{actors} ti hanno menzionato in un %{post_link}."
       one: "%{actors} ti ha menzionato in un %{post_link}."
-      other: "%{actors} ti ha menzionato in un %{post_link}."
+      other: "%{actors} ti hanno menzionato in un %{post_link}."
       two: "%{actors} ti hanno menzionato in un %{post_link}."
-      zero: "%{actors} ti ha menzionato in un %{post_link}."
+      zero: "%{actors} ti hanno menzionato in un %{post_link}."
     mentioned_deleted: 
       few: "%{actors} ti hanno menzionato in un post che è stato eliminato."
       many: "%{actors} ti hanno menzionato in un post che è stato eliminato."
@@ -444,7 +446,7 @@ it:
     email_sent_by_diaspora: "Questo messaggio è stato spedito da Diaspora.  Se preferisci smettere di ricevere questo tipo di email,"
     hello: "Ciao %{name}!"
     liked: 
-      liked: "%{name} ha appena apprezzato il tuo post: "
+      liked: "A %{name} piace il tuo post"
       view_post: "Leggi il post >"
     mentioned: 
       mentioned: "ti ha menzionato in un post:"
@@ -452,7 +454,7 @@ it:
     private_message: 
       reply_to_or_view: "Rispondi o leggi questa conversazione >"
     reshared: 
-      reshared: "%{name} ha appena condiviso il tuo post"
+      reshared: "%{name} ha condiviso il tuo post"
       view_post: "Vedi il post >"
     single_admin: 
       admin: "Il tuo amministratore Diaspora"
@@ -604,13 +606,13 @@ it:
       unhappy: "Triste?"
       update: "Aggiorna"
     new: 
-      create_my_account: "Crea il mio account"
+      create_my_account: "Crea il mio account!"
       enter_email: "Inserisci un indirizzo email"
       enter_password: "Inserisci una password"
       enter_password_again: "Inserisci la stessa password di prima"
       enter_username: "Scegli un nome utente (inserisci solo lettere, numeri e trattino basso)"
       join_the_movement: "Partecipa al movimento!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Il Social Network con il <3"
   requests: 
     create: 
       sending: "Invio in corso..."
@@ -652,6 +654,8 @@ it:
   search: "Cerca"
   services: 
     create: 
+      already_authorized: "L'account %{service_name} specificato è già stato autorizzato dall'utente con ID %{diaspora_id}."
+      failure: "Autenticazione fallita."
       success: "Autenticazione avvenuta con successo."
     destroy: 
       success: "Autenticazione cancellata con successo."
@@ -711,15 +715,22 @@ it:
     notification: 
       new: "Nuovo %{type} da %{from}"
     public_explain: 
+      control_your_audience: "Controlla il tuo pubblico"
       logged_in: "accesso effettuato a %{service}"
       manage: "gestisci i servizi collegati"
+      new_user_welcome_message: "Usa i #tag per classificare i post e trovare chi ha i tuoi stessi interessi. Richiama l'attenzione delle persone più in gamba con le @Menzioni"
       outside: "I messaggi pubblici saranno visibili a persone al di fuori di Diaspora."
+      share: "Condividi"
       title: "Configura i servizi collegati"
+      visibility_dropdown: "Usa questo menu per cambiare la visibilità del tuo post. (Ti suggeriamo di rendere pubblico il primo che stai scrivendo.)"
     publisher: 
       all: "tutti"
       all_contacts: "tutti i contatti"
       discard_post: "Elimina il post"
       make_public: "rendi pubblico"
+      new_user_prefill: 
+        hello: "Ciao a tutti, eccomi qui! Hey everyone, I'm #%{new_user_tag}"
+        i_like: "I miei interessi sono %{tags}."
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       publishing_to: "stai condividendo con: "
@@ -730,6 +741,8 @@ it:
     reshare: 
       reshare: "Condividi"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Non mi piace"
       hide_and_mute: "Nascondi e Disattiva le notifiche"
       like: "Mi piace"
@@ -758,28 +771,30 @@ it:
     show_more_comments: "Mostra gli altri %{number} commenti"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "I tuoi Aspetti"
+    aspects_stream: "Aspetti"
+    commented_on: "commenti"
+    community_spotlight_stream: "In evidenza dalla comunità"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Persone con questi tag"
+      follow: "Follow"
+      title: "#Tag che segui"
+    followed_tags_stream: "#Tag che segui"
+    mentioned_stream: "@Menzioni"
     mentions: 
       contacts_title: "Persone che ti hanno menzionato"
-      title: "Le tue menzioni"
+      title: "@Menzioni"
     multi: 
-      contacts_title: "People in your Stream"
+      contacts_title: "Persone nel tuo Stream"
       title: "Stream"
-    posted: "posted"
+    posted: "post"
     public: 
       contacts_title: "Chi ha postato di recente"
       title: "Attività Pubblica"
-    recently: "recently:"
+    recently: "ordina per:"
     tags: 
-      contacts_title: "Persone con questi tag"
+      contacts_title: "Persone con questo tag"
       title: "Post con tag: %{tags}"
   tag_followings: 
     create: 
@@ -824,59 +839,39 @@ it:
       change_language: "Cambia lingua"
       change_password: "Cambia password"
       close_account: "Chiudi account"
-      comment_on_post: "...qualcuno ha commentato il tuo post?"
+      comment_on_post: "...qualcuno commenta un tuo post?"
       current_password: "Password attuale"
       download_photos: "scarica le mie foto"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
       email_awaiting_confirmation: "È stato spedito su %{unconfirmed_email} un link di attivazione. Continueremo ad usare la tua email originale %{email} finché non cliccherai sul link e attiverai il nuovo indirizzo."
       export_data: "Esporta Dati"
-      liked: "...a qualcuno piace il tuo post?"
+      getting_started: "Preferenze nuovo utente"
+      liked: "...a qualcuno piace un tuo post?"
       mentioned: "...sei menzionato in un post?"
       new_password: "Nuova password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...hai ricevuto un messaggio privato?"
       receive_email_notifications: "Ricevi notifiche via email quando..."
       reshared: "...qualcuno condivide un tuo post?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Vuoi vedere gli utenti in evidenza nel tuo Stream?"
+      show_getting_started: "Riattiva la Guida iniziale"
       started_sharing: "...qualcuno vuole condividere con te?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Preferenze dello Stream"
       your_email: "La tua email"
       your_handle: "Il tuo ID"
     getting_started: 
-      bold: "aspetti"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Fantastico! Fammi entrare in Diaspora*"
       community_welcome: "La comunità di Diaspora ti dà il benvenuto a bordo!"
-      connect_to: "Connettiti a"
-      connect_to_your_other_social_networks: "Connetti altri social network"
-      connect_to_your_other_social_networks_explanation_p1: "Connetti altri servizi, così potrai pubblicare alcuni contenuti su altri social network."
-      connect_to_your_other_social_networks_explanation_p2: "Con Facebook, potrai cercare gli amici che sono anche su Diaspora o mandare inviti."
-      connect_with_people: "Connettiti con gente speciale"
-      connect_with_people_explanation_pt1: "Stai in contatto con le persone mettendole in uno o più dei tuoi %{bold}."
-      connect_with_people_explanation_pt2: "Gli aspetti sono un sistema intuitivo per raggruppare vecchie e nuove conoscenze in modo riservato, così potrai filtrare o condividere i contenuti con chi vuoi e con facilità."
-      edit_profile: "Modifica il Profilo"
-      featured_tags: "Segui i tag in evidenza"
-      fill_out_your_profile: "Riempi il tuo profilo"
-      find_friends: "Cerca degli amici"
-      find_friends_from_facebook: "cerca gli amici da Facebook"
-      finished: "Finito"
-      follow_your_interests: "Segui i tuoi interessi"
-      get_updates_from_core: "Ricevi gli aggiornamenti sul progetto dal quartier generale."
       hashtag_explanation: "I tag ti permettono di parlare dei tuoi interessi e di seguirli. Sono anche un ottimo sistema per trovare nuove persone su Diaspora."
-      not_mandatory: "I passi successivi non sono obbligatori, ma completandoli potrai avere un'esperienza migliore su Diaspora."
-      profile_description: "Sarà più facile che le persone ti trovino se riempi i campi del tuo profilo."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Compleanno"
-        gender: "Sesso"
-        location: "Località"
-        name: "Nome"
-        photo: "Foto"
-        tags: "Tag"
-      search_for_hashtags: "Cerca #tag"
-      search_for_people: "Cerca persone"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Benvenuto!"
-      welcome_with_name: "Ciao %{name}!"
+      hashtag_suggestions: "Prova a seguire tag tipo #art, #movies, #gif, ecc."
+      hooking_up_fb: "abbinando il tuo account Facebook"
+      saved: "Salvato!"
+      we_can_speed_things_up: "Possiamo velocizzare le cose"
+      well_hello_there: "Ciao!"
+      what_are_you_in_to: "Di cosa ti interessi?"
+      what_facebook_does: "a Diaspora. Così scaricherai nome e foto, oltre ad abilitare l'invio dei post anche verso l'altro social network."
+      who_are_you: "Chi sei?"
     logged_out: 
       go_mobile: "Passa alla versione mobile."
       on_your_mobile_device: "sul tuo cellulare per accedere a Diaspora* mobile."
@@ -891,8 +886,8 @@ it:
       language_not_changed: "Il cambio di lingua è fallito"
       password_changed: "Password cambiata. Ora puoi effettuare l'accesso con la tua nuova password."
       password_not_changed: "Il cambio di password è fallito"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Errore nella modifica delle impostazioni"
+      settings_updated: "Le impostazioni sono state modificate"
       unconfirmed_email_changed: "L'email è cambiata. E' necessario attivare l'indirizzo."
       unconfirmed_email_not_changed: "Il cambio di email è fallito"
   webfinger: 
@@ -901,3 +896,4 @@ it:
     no_person_constructed: "Non si può risalire a neanche una persona da questa hcard."
     not_enabled: "webfinger non attivo sull'host di %{account}"
     xrd_fetch_failed: "impossibile recuperare il xrd dall'account %{account}"
+  welcome: "Benvenuto!"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index bcd6a9f56..a978bcf3b 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -64,6 +64,9 @@ ja:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "このアスペクトの連絡先はお互いの存在が確認できません。"
     contacts_visible: "このアスペクトの連絡先はお互いの存在が確認できます。"
     create: 
@@ -89,7 +92,6 @@ ja:
       aspect_not_empty: "アスペクトは空ではありません。"
       remove: "削除"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ ja:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "連絡先無し"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "投稿する"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "アスペクト%{count}集"
     move_contact: 
@@ -652,6 +654,8 @@ ja:
   search: "検索"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "認証に成功しました。"
     destroy: 
       success: "認証を削除するのに成功しました。"
@@ -711,15 +715,22 @@ ja:
     notification: 
       new: "%{from}さんから新しい%{type}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "%{service}へログインしました。"
       manage: "提携サービスを管理する"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "公開投稿はダイアスポラ外の人にも表示されます。"
+      share: "Share"
       title: "提携サービスを設定する"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "すべて"
       all_contacts: "全ての連絡先"
       discard_post: "Discard post"
       make_public: "公開にする"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "%{aspect}に投稿する"
       posting: "投稿中"
       publishing_to: "公開先："
@@ -730,6 +741,8 @@ ja:
     reshare: 
       reshare: "再共有"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "これ嫌い！"
       hide_and_mute: "Hide and Mute"
       like: "これ好き！"
@@ -763,7 +776,9 @@ ja:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ ja:
       edit_account: "アカウント編集"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "データ出力"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "投稿に自分がメンションされたとき"
       new_password: "新しいパスワード"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "非公開メッセージが届いたとき"
       receive_email_notifications: "通知メールの送信設定"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "メールアドレス"
       your_handle: "ダイアスポラのユーザ名"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "プロフィールを編集する"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "完了！"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "写真"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "ダイアスポラへようこそ！"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ ja:
     no_person_constructed: "このhcardから連絡先人を生成することができませんでした。"
     not_enabled: "%{account}のポッドではwebfingerが無効になっているようです。"
     xrd_fetch_failed: "%{account}のxrd取得にエラーが発生しました。"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index e5bbc4db4..9464c4e73 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -62,8 +62,11 @@ ko:
     aspect_listings: 
       add_an_aspect: "+ 애스펙 추가"
       deselect_all: "선택 해제"
-      edit_aspect: "%{name} 수정"
+      edit_aspect: "%{name} 고치기"
       select_all: "모두 선택"
+    aspect_stream: 
+      stay_updated: "최신으로 유지하기"
+      stay_updated_explanation: "내 주 스트림은 내 컨택, 내가 팔로우한 태그, 그리고 디아스포라 커뮤니티의 독창적인 구성원들이 공유한 게시물로 채워집니다."
     contacts_not_visible: "이 애스펙에 있는 사람들이 서로를 볼 수 없습니다."
     contacts_visible: "이 애스펙에 있는 사람들이 서로를 볼 수 있습니다."
     create: 
@@ -89,7 +92,6 @@ ko:
       aspect_not_empty: "애스펙이 비어있지 않습니다"
       remove: "지우기"
     index: 
-      community_spotlight: "커뮤니티 스포트라이트"
       cubbies: 
         explanation: "Cubbi.es는 개발중인 최초의 디아스포라 어플입니다."
         heading: "Cubbi.es에 연결하기"
@@ -101,27 +103,27 @@ ko:
       donate: "기부하기"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       help: 
-        do_you: "당신은 :"
-        email_feedback: "%{link} 당신의 피드백, 원하는 경우"
-        feature_and_forum: "%{gs} 와 %{forum}: 커뮤니티-강력한 지원과 기능 요청"
-        feature_suggestion: "... %{link} 추천이 있나요?"
-        find_a_bug: "... %{link}를 찾았나요?"
-        have_a_question: "... %{link}를 가지고 있나요?"
-        here_to_help: "Diaspora community is here to help!"
+        do_you: "해시태그:"
+        email_feedback: "%{link}: 이메일로 보낼 수도 있습니다"
+        feature_and_forum: "%{gs}과 %{forum}: 커뮤니티의 지원과 기능 요청"
+        feature_suggestion: "%{link}: 제안해주세요!"
+        find_a_bug: "%{link}: 버그를 보고해주세요!"
+        have_a_question: "%{link}: 물어보세요!"
+        here_to_help: "디아스포라 커뮤니티가 도와드립니다!"
         need_help: "도움이 필요하세요?"
-        satisfaction: "%{link}: 커뮤니티-강력한 지원"
-        tutorials_and_wiki: "%{tutorial} 와 %{wiki}: 커뮤니티-강력한 튜토리얼, HOW-To 그리고 뉴스"
+        satisfaction: "%{link}: 커뮤니티 지원"
+        tutorials_and_wiki: "%{tutorial}과 %{wiki}: 커뮤니티의 튜토리얼, 설명서와 소식들"
+      introduce_yourself: "내 스트림에서 스스로를 나타내십시오."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "컨택 없음"
       no_tags: "태그 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
       post_a_message: "새 메시지 올리기 >>"
-      see_more_from_us: "D* 커뮤니티에 대해 자세히 알아보기."
       services: 
         content: "다음의 여러 서비스를 디아스포라에 연결할 수 있습니다"
         heading: "서비스 연결"
       unfollow_tag: "#%{tag} 태그 팔로우 멈추기"
-      welcome: "Welcome"
+      welcome_to_diaspora: "%{name}님, 디아스포라에 오신걸 환영합니다!"
       your_aspects: "내 애스펙"
     many: "애스펙 %{count}개"
     move_contact: 
@@ -132,8 +134,8 @@ ko:
       create: "만들기"
       name: "이름"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "커뮤니티 스포트라이트"
+      or_spotlight: "%{link}와 공유할 수도 있습니다"
       try_adding_some_more_contacts: "더 많은 컨택을 검색(위)하거나 초대(오른쪽)하세요."
       you_should_add_some_more_contacts: "컨택을 좀 더 추가하세요!"
     no_posts_message: 
@@ -148,7 +150,7 @@ ko:
     selected_contacts: 
       manage_your_aspects: "내 애스펙 관리하기."
       no_contacts: "아직 컨택이 없습니다."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "커뮤니티 스포트라이트 모두 보기"
       view_all_contacts: "모든 컨택 보기"
     show: 
       edit_aspect: "애스펙 고치기"
@@ -170,13 +172,13 @@ ko:
     post_success: "올렸습니다! 닫힙니다!"
   cancel: "취소"
   comments: 
-    few: "%{count}개의 댓글"
-    many: "%{count}개의 댓글"
+    few: "댓글 %{count}개"
+    many: "댓글 %{count}개"
     new_comment: 
       comment: "댓글 달기"
       commenting: "댓글 다는 중···"
-    one: "1개의 댓글"
-    other: "%{count}개의 댓글"
+    one: "댓글 한 개"
+    other: "댓글 %{count}개"
     two: "댓글 %{count}개"
     zero: "댓글 없음"
   contacts: 
@@ -264,8 +266,8 @@ ko:
       share_what_you_want: "원하는 사람들과 원하는 걸 공유하자"
       simplicity: "간편함"
       simplicity_explanation: "디아스포라에서는 깨끗하고 쉽게 공유합니다. 개인정보도 마친가지입니다. 본래 개인적인 디아스포라에서는 프로필 보안을 유지하기 위해 여러 페이지에 걸친 설정과 옵션을 힘겹게 거치지 않아도 됩니다."
-      tagline_first_half: "당신이 원하는 것을 공유,"
-      tagline_second_half: "당신이 원하는 사람과 함께."
+      tagline_first_half: "원하는 사람들과"
+      tagline_second_half: "원하는 걸 공유하자."
   invitations: 
     a_facebook_user: "페이스북 사욤자"
     check_token: 
@@ -373,7 +375,7 @@ ko:
         one: "+ 한 명"
         other: "+ %{count}명"
         two: "과 %{count}명"
-        zero: "그리고 아무도"
+        zero: "and nobody else"
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
     liked: 
@@ -579,19 +581,19 @@ ko:
       your_photo: "내 사진"
       your_private_profile: "개인 프로필"
       your_public_profile: "공개 프로필"
-      your_tags: "다섯자 미만으로 나를 표현해보세요"
+      your_tags: "낱말 5개로 나를 표현하세요"
       your_tags_placeholder: "예) #movies #kittens #travel #teacher #newyork"
     update: 
       failed: "프로필 업데이트 실패"
       updated: "프로필을 업데이트했습니다"
   public: "공개"
   reactions: 
-    few: "%{count}회 리액션"
-    many: "%{count}회 반응"
-    one: "1회 반응"
-    other: "%{count}회 반응"
-    two: "%{count}회 반응"
-    zero: "반응 없음"
+    few: "반응 %{count}개"
+    many: "반응 %{count}개"
+    one: "반응 한 개"
+    other: "반응 %{count}개"
+    two: "반응 %{count}개"
+    zero: "반응 %{count}개"
   registrations: 
     closed: "우리 디아스포라 팓은 가입이 닫혀있습니다."
     create: 
@@ -610,7 +612,7 @@ ko:
       enter_password_again: "암호를 다시 입력하세요"
       enter_username: "사용자명을 선택하세요 (로마자, 아라비아 숫자, 언더스코어만)"
       join_the_movement: "합류하세요!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "소셜 네트워크♡"
   requests: 
     create: 
       sending: "공유를 요청하고 있습니다."
@@ -647,11 +649,13 @@ ko:
         zero: "재공유"
       reshare_confirmation: "%{author}님의 %{text} 공유물을 재공유합니까?"
       reshare_original: "원본 재공유"
-      reshared_via: "다음을 통해 재공유 되었음 : "
+      reshared_via: "재공유함 via"
       show_original: "원본 보기"
   search: "검색"
   services: 
     create: 
+      already_authorized: "디아스포라의 %{diaspora_id} 계정은 이미 %{service_name} 서비스의 계정에 의해 인증되었습니다."
+      failure: "인증을 실패했습니다."
       success: "성공적으로 인증되었습니다."
     destroy: 
       success: "인증을 성공적으로 지웠습니다."
@@ -711,15 +715,22 @@ ko:
     notification: 
       new: "%{from}님의 새 %{type}"
     public_explain: 
+      control_your_audience: "보일 사람 제어하기"
       logged_in: "%{service}에 로그인 되었습니다"
       manage: "연결된 서비스 관리"
+      new_user_welcome_message: "#해시태그 는 내 공유물을 분류하고, 같은 관심사를 가진 사람들을 찾습니다. @멘션 으로 멋진 사람들을 부릅니다."
       outside: "공개 공유물은 디아스포라 밖의 사람들도 볼 수 있습니다."
+      share: "공유하기"
       title: "서비스 설정"
+      visibility_dropdown: "이 드롭다운 메뉴로 공유물이 누구에게 보일지 바꿉니다. (첫 공유물은 공개로 할 것을 권합니다.)"
     publisher: 
       all: "모두"
       all_contacts: "모든 컨택"
       discard_post: "공유물 삭제"
       make_public: "공개하기"
+      new_user_prefill: 
+        hello: "#%{new_user_tag} 반갑습니다! 새로 가입했습니다."
+        i_like: "제 관심사는 %{tags} 입니다."
       post_a_message_to: "%{aspect}에 공유물 올리기"
       posting: "올리는 중···"
       publishing_to: "올릴 곳: "
@@ -730,6 +741,8 @@ ko:
     reshare: 
       reshare: "재공유"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "싪어요"
       hide_and_mute: "숨기고 알림 끄기"
       like: "좋아요"
@@ -758,28 +771,30 @@ ko:
     show_more_comments: "댓글 %{number}개 더 보기"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "내 애스펙"
+    aspects_stream: "애스펙"
+    commented_on: "댓글 달린 순"
+    community_spotlight_stream: "커뮤니티 스포트라이트"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      follow: "Follow"
+      title: "#팔로우한 태그"
+    followed_tags_stream: "#팔로우한 태그"
+    mentioned_stream: "@멘션"
     mentions: 
       contacts_title: "나를 멘션한 사람들"
       title: "내 멘션"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "내 스트림에 있는 사람들"
+      title: "스트림"
+    posted: "올린 순"
     public: 
-      contacts_title: "최근 게시물"
+      contacts_title: "최근 게시자"
       title: "공개 활동"
-    recently: "recently:"
+    recently: "최근에"
     tags: 
-      contacts_title: "이 태그를 발견한 사람들"
+      contacts_title: "People who dig this tag"
       title: "태그: %{tags}"
   tag_followings: 
     create: 
@@ -791,7 +806,7 @@ ko:
   tags: 
     show: 
       follow: "#%{tag} 태그 팔로우하기"
-      followed_by: "다음에 의해 팔로우됨: "
+      followed_by: "팔로우한 사람들"
       following: "#%{tag} 태그 팔로우중"
       nobody_talking: "아직 %{tag} 태그가 달린 공유물이 없습니다."
       people_tagged_with: "%{tag} 태그가 달린 사람들"
@@ -831,52 +846,32 @@ ko:
       edit_account: "계정 고치기"
       email_awaiting_confirmation: "%{unconfirmed_email} 로 활성화 링크를 보냈습니다. 이 링크를 따라 새 주소를 활성화하기 전까지는 원래 이메일 주소 %{email} 를 사용합니다."
       export_data: "자료 뽑아내기"
+      getting_started: "새 사용자 환경 설정"
       liked: "누군가가 내 공유물을 좋아할 때"
       mentioned: "내가 멘션되었을 때"
       new_password: "새 암호"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "쪽지를 받았을 때"
       receive_email_notifications: "이럴 때 이메일 알림을 받겠습니다"
       reshared: "누군가 내 공유물을 재공유할 때"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "스트림에 커뮤니티 스포트라이트를 표시할까요?"
+      show_getting_started: "시작 안내 다시 보기"
       started_sharing: "누군가가 나와 공유를 시작할 때"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "스트림 환경 설정"
       your_email: "이메일 주소"
       your_handle: "디아스포라 핸들"
     getting_started: 
-      bold: "애스펙"
-      community_spotlight: "Community spotlight"
-      community_welcome: "디아스포라 커뮤니티는 귀하의 승선을 환영합니다!"
-      connect_to: "연결하기:"
-      connect_to_your_other_social_networks: "다른 소셜 네트워크에 연결하기"
-      connect_to_your_other_social_networks_explanation_p1: "서비스에 연결하면 해당 서비스에도 공유물을 게시할 수 있습니다."
-      connect_to_your_other_social_networks_explanation_p2: "페이스북을 이용하면, 디아스포라에 이미 가입한 친구들을 찾거나 다른 친구들을 초대할 수 있습니다."
-      connect_with_people: "멋진 사람들과 연결하기"
-      connect_with_people_explanation_pt1: "누군가를 한 개 이상의 애스펙으로 분류하면"
-      connect_with_people_explanation_pt2: "애스펙은 새로운 컨택, 낯익은 컨택, 사적인 컨택을 분류하여 일부와만 공유하거나 일부를 거를 수 있게하는 쉽고 직관적인 방법입니다."
-      edit_profile: "프로필 고치기"
-      featured_tags: "추천 태그"
-      fill_out_your_profile: "프로필 채우기"
-      find_friends: "친구 찾기"
-      find_friends_from_facebook: "페이스북에서 친구 찾기"
-      finished: "완료!"
-      follow_your_interests: "내 관심사 팔로우하기"
-      get_updates_from_core: "코어 팀으로부터 프로젝트에 대한 소식을 받습니다."
+      awesome_take_me_to_diaspora: "디아스포라* 시작하기"
+      community_welcome: "디아스포라 커뮤니티가 여러분을 환영합니다!"
       hashtag_explanation: "해시태그로 내 관심사에 대해 말하거나 팔로우할 수 있습니다. 디아스포라에서 새로운 사람들을 찾을 수 있는 또 하나의 훌륭한 방법입니다."
-      not_mandatory: "다음 단계를 마치면 디아스포라를 더 나은 환경에서 사용할 수 있지만, 필수는 아닙니다."
-      profile_description: "프로필을 채우면 누군가가 나를 더 쉽게 찾을 수 있습니다."
-      profile_fields: 
-        bio: "자기소개"
-        birthday: "생일"
-        gender: "성별"
-        location: "위치"
-        name: "이름"
-        photo: "사진"
-        tags: "태그"
-      search_for_hashtags: "#해시태그 검색하기"
-      search_for_people: "사람 검색하기"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "환영합니다!"
-      welcome_with_name: "%{name}님 환영합니다!"
+      hashtag_suggestions: "#art, #movies, #gif 같은 태그를 팔로우해보세요."
+      hooking_up_fb: "페이스북 계정을 연결하면"
+      saved: "저장되었습니다!"
+      we_can_speed_things_up: "디아스포라에"
+      well_hello_there: "자, 어서오십시오!"
+      what_are_you_in_to: "뭘 좋아해요?"
+      what_facebook_does: "더 간편히 가입할 수 있습니다. 페이스북에서 이름과 사진을 가져올 수 있고, 두 서비스에 서로 게시할 수도 있습니다."
+      who_are_you: "누구시죠?"
     logged_out: 
       go_mobile: "이제 모바일로 즐기세요."
       on_your_mobile_device: "에 접속하면 디아스포라* 모바일을 쓸 수 있습니다."
@@ -891,8 +886,8 @@ ko:
       language_not_changed: "언어를 바꿀 수 없습니다"
       password_changed: "암호를 바꿨습니다"
       password_not_changed: "암호를 바꿀 수 없습니다"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "설정을 고칠 수 없습니다"
+      settings_updated: "설정을 고쳤습니다"
       unconfirmed_email_changed: "이메일을 고쳤습니다. 활성화가 필요합니다."
       unconfirmed_email_not_changed: "이메일 고치기 실패"
   webfinger: 
@@ -901,3 +896,4 @@ ko:
     no_person_constructed: "이 hcard로부터 아무도 만들어지지 않았습니다."
     not_enabled: "웹핑거가 %{account}의 호스트에서 활성화 된 것 같지 않습니다."
     xrd_fetch_failed: "%{account} 계정으로부터 xrd를 가져오는 것에 실패했습니다."
+  welcome: "환영합니다!"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index f19be771f..0e09f9a85 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -64,6 +64,9 @@ lt:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ lt:
       aspect_not_empty: "Aspektas netuščias"
       remove: "šalinti"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ lt:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ lt:
   search: "Paieška"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Prijungimas sėkmingas."
     destroy: 
       success: "Atjungimas sėkmingas."
@@ -711,15 +715,22 @@ lt:
     notification: 
       new: "Naujas %{type} iš vartotojo \"%{from}\""
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "Prisijungta į %{service}"
       manage: "valdyti prijungtus tinklus"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Viešos žinutės bus matomos kitiems už Diasporos ribų."
+      share: "Share"
       title: "Tu ketini skelbti viešą žinutę!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "viskas"
       all_contacts: "visi kontaktai"
       discard_post: "Discard post"
       make_public: "paviešinti"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ lt:
     reshare: 
       reshare: "Skelbti papildomai"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ lt:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ lt:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksportuoti duomenis"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Naujas slaptažodis"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Tavo el. pašto adresas"
       your_handle: "Tavo Diasporos vartotojo vardas"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Užpildyk savo profilį"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Baigta!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Labas! Atvykai į Diasporą!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ lt:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index fc755699c..d50531bd7 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -64,6 +64,9 @@ mk:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ mk:
       aspect_not_empty: "Аспектот не е празен"
       remove: "одстрани"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ mk:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ mk:
   search: "Барај"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Автентификацијата е успешна!"
     destroy: 
       success: "Успешно уништена автентификација."
@@ -711,15 +715,22 @@ mk:
     notification: 
       new: "Нов %{type} од %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "најавен во %{service}"
       manage: "менаџирај ги поврзаните сервиси"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Јавните пораки ќе бидат достапни за сите кои се надвор од Diaspora."
+      share: "Share"
       title: "На пат сте да испратите јавна порака!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "сите"
       all_contacts: "сите контакти"
       discard_post: "Discard post"
       make_public: "направи јавен"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ mk:
     reshare: 
       reshare: "Сподели повторно"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ mk:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ mk:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Изнеси податоци"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Нова лозинка"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Вашиот е-маил"
       your_handle: "Вашето diaspora корисничко име"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Уреди го вашиот профил"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Заврши!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Добредојдe на Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ mk:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index a8786a537..625bf0609 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -64,6 +64,9 @@ nb:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontakter i dette aspektet vil ikke kunne se hverandre."
     contacts_visible: "Kontakter i dette aspektet vil kunne se hverandre."
     create: 
@@ -89,7 +92,6 @@ nb:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "fjern"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ nb:
         need_help: "Trenger du hjelp?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
       people_sharing_with_you: "Folk som deler med deg"
       post_a_message: "legg ut en melding >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspekter"
     move_contact: 
@@ -652,6 +654,8 @@ nb:
   search: "Søk"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Autentisering vellykket."
     destroy: 
       success: "Successfully destroyed authentication."
@@ -711,15 +715,22 @@ nb:
     notification: 
       new: "Ny %{type} fra %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "innlogget på %{service}"
       manage: "behandle tilkoblede tjenester"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Offentlige meldinger vil være synlige for personer utenfor Diaspora."
+      share: "Share"
       title: "Du er i ferd med å poste et offentlig innlegg!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "alle"
       all_contacts: "alle kontakter"
       discard_post: "Discard post"
       make_public: "gjør offentlig"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
       publishing_to: "publiserer til:"
@@ -730,6 +741,8 @@ nb:
     reshare: 
       reshare: "Del på nytt"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Liker ikke"
       hide_and_mute: "Hide and Mute"
       like: "Liker"
@@ -763,7 +776,9 @@ nb:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ nb:
       edit_account: "Endre konto"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Eksporter Data"
+      getting_started: "New User Prefrences"
       liked: "... noen liker innlegget ditt?"
       mentioned: " du nevnes i et innlegg?"
       new_password: "Nytt Passord"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: " du mottar en privat melding?"
       receive_email_notifications: "Motta varsler på epost når:"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "... noen begynner å dele med deg?"
       stream_preferences: "Stream Preferences"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora brukernavn"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Rediger profilen"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Finn venner"
-      find_friends_from_facebook: "finn venner fra Facebook"
-      finished: "Ferdig!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Bursdag"
-        gender: "Gender"
-        location: "Location"
-        name: "Navn"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Velkommen til Diaspora!"
-      welcome_with_name: "Velkommen %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ nb:
     no_person_constructed: "Ingen personer kunne konstrueres fra dette hCard."
     not_enabled: "det virker ikke som webfinger er aktivert for % {account}'s vert"
     xrd_fetch_failed: "kunne ikke få xrd fra kontoen %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 75f844dc7..dc761ebc2 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -64,6 +64,9 @@ nl:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacten in dit aspect zullen elkaar niet kunnen zien."
     contacts_visible: "Contacten in dit aspect zullen elkaar kunnen zien."
     create: 
@@ -89,7 +92,6 @@ nl:
       aspect_not_empty: "Aspect niet leeg"
       remove: "verwijderen"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is de eerste Diaspora applicatie in ontwikkeling."
         heading: "Verbind met Cubbie.es"
@@ -111,17 +113,17 @@ nl:
         need_help: "Hulp nodig?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Houd %{pod} snel door bij te dragen aan de maandelijkse koffie kosten!"
       no_contacts: "Geen contacten"
       no_tags: "+ Vind een tag"
       people_sharing_with_you: "Mensen die met jou delen"
       post_a_message: "plaats een bericht >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Je kunt de volgende service met Diaspora verbinden:"
         heading: "Verbind Services"
       unfollow_tag: "Stop met volgen van #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Jouw Aspecten"
     many: "%{count} aspecten"
     move_contact: 
@@ -586,12 +588,12 @@ nl:
       updated: "Profiel bijgewerkt"
   public: "Openbaar"
   reactions: 
-    few: "%{count} reactions"
-    many: "%{count} reactions"
-    one: "1 reaction"
-    other: "%{count} reactions"
+    few: "%{count} reacties"
+    many: "%{count} reacties"
+    one: "1 reactie"
+    other: "%{count} reacties"
     two: "%{count} reactions"
-    zero: "0 reactions"
+    zero: "0 reacties"
   registrations: 
     closed: "Registratie is gesloten op deze Diaspora pod."
     create: 
@@ -652,6 +654,8 @@ nl:
   search: "Zoek"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authenticatie succesvol."
     destroy: 
       success: "Authenticatie succesvol vernietigd."
@@ -711,15 +715,22 @@ nl:
     notification: 
       new: "Nieuw %{type} van %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "verbonden met %{service}"
       manage: "beheer verbonden services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Openbare berichten zijn zichtbaar voor mensen buiten Diaspora."
+      share: "Share"
       title: "Stel verbonden services in"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "al"
       all_contacts: "alle contacten"
       discard_post: "Maak veld leeg"
       make_public: "maak openbaar"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
       publishing_to: "delen met: "
@@ -730,6 +741,8 @@ nl:
     reshare: 
       reshare: "Herdeel"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Vind ik niet meer leuk"
       hide_and_mute: "Verberg en blokkeer"
       like: "Vind ik leuk"
@@ -763,12 +776,14 @@ nl:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
     mentions: 
-      contacts_title: "People who mentioned you"
+      contacts_title: "Mensen die jou hebben genoemd"
       title: "Your Mentions"
     multi: 
       contacts_title: "People in your Stream"
@@ -780,7 +795,7 @@ nl:
     recently: "recently:"
     tags: 
       contacts_title: "People who dig these tags"
-      title: "Posts tagged: %{tags}"
+      title: "Posts getagged: %{tags}"
   tag_followings: 
     create: 
       failure: "Volgen mislukt: #%{name}"
@@ -831,52 +846,32 @@ nl:
       edit_account: "Bewerk account"
       email_awaiting_confirmation: "We hebben een activatielink verzonden naar %{unconfirmed_email}. Totdat je het adres geactiveerd hebt zullen we je originele adress blijven gebruiken %{email}."
       export_data: "Exporteer data"
+      getting_started: "New User Prefrences"
       liked: "... iemand je post leuk vind?"
       mentioned: "...je genoemd word in een post?"
       new_password: "Nieuw wachtwoord"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...je een privébericht ontvangt?"
       receive_email_notifications: "Ontvang e-mail notificaties wanneer..."
       reshared: "...iemand je post doorgeeft?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...iemand met je begint te delen?"
       stream_preferences: "Stream Preferences"
       your_email: "Jouw e-mail"
       your_handle: "Jouw Diaspora ID"
     getting_started: 
-      bold: "aspecten"
-      community_spotlight: "Community spotlight"
-      community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Verbind met"
-      connect_to_your_other_social_networks: "Verbind met je andere sociale netwerken"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Maak kennis met interessante mensen"
-      connect_with_people_explanation_pt1: "Verbind met mensen door ze toe te voegen aan één of meer van je %{bold}."
-      connect_with_people_explanation_pt2: "Aspecten zijn een intuïtieve manier om nieuwe en bekende gezichten te groeperen, alleen zichtbaar voor jou, waardoor je makkelijk content kan filteren en met specifieke groepen kunt delen."
-      edit_profile: "Bewerk profiel"
-      featured_tags: "Aanbevolen tags"
-      fill_out_your_profile: "Vul je profiel aan"
-      find_friends: "Vind vrienden"
-      find_friends_from_facebook: "vind vrienden via Facebook"
-      finished: "Klaar"
-      follow_your_interests: "Volg je interesses"
-      get_updates_from_core: "Get updates about the project from the core team."
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      community_welcome: "De Diaspora gemeenschap is verheugd je aan boord te hebben!"
       hashtag_explanation: "Hashtags laten je gemakkelijk jou interesses volgen. Bovendien kunnen ze je helpen bij het vinden van nieuwe contacten op Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Maak het makkelijker voor mensen om je te vinden door je profiel aan te vullen."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Geboortedatum"
-        gender: "Geslacht"
-        location: "Locatie"
-        name: "Naam"
-        photo: "Foto"
-        tags: "Tags"
-      search_for_hashtags: "Zoek #hashtags"
-      search_for_people: "Zoek mensen"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welkom!"
-      welcome_with_name: "Welkom, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ nl:
     no_person_constructed: "Er kon geen persoon worden gemaakt van deze hcard."
     not_enabled: "webfinger lijkt niet aan te staan voor %{account}'s provider"
     xrd_fetch_failed: "er was een probleem bij het verkrijgen van de xrd van het account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 11a44fa04..ecc62ec31 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -64,6 +64,9 @@ nn:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontaktar i dette aspektet vil ikkje kunna sjå kvarandre."
     contacts_visible: "Kontaktar i dette aspektet vil kunna sjå kvarandre."
     create: 
@@ -89,7 +92,6 @@ nn:
       aspect_not_empty: "Aspektet er ikkje tomt"
       remove: "fjern"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es er den første Diaspora-applikasjonen som vert utvikla."
         heading: "Kopla til Cubbi.es"
@@ -111,17 +113,17 @@ nn:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Sjå til at %{pod} kjører raskt. Gjev tenarane ein kveik ved å donera månadleg."
       no_contacts: "Ingen kontaktar"
       no_tags: "+ Finn ein etikett du vil følgja"
       people_sharing_with_you: "Folk som deler med deg"
       post_a_message: "skriv eit innlegg >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Du kan kopla desse tenestene til Diaspora:"
         heading: "Kopla tenester"
       unfollow_tag: "Slutt å følgja #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Aspekta dine"
     many: "%{count} aspekt"
     move_contact: 
@@ -134,7 +136,7 @@ nn:
     no_contacts_message: 
       community_spotlight: "community spotlight"
       or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Du kan søkja etter (øvst) eller invitera (høgre) fleire kontaktar."
+      try_adding_some_more_contacts: "Du kan søkja etter eller invitera fleire kontaktar."
       you_should_add_some_more_contacts: "Du bør leggja til nokre fleire kontaktar."
     no_posts_message: 
       start_talking: "Ingen har sagt noko enno."
@@ -260,8 +262,8 @@ nn:
       learn_about_host: "Learn about how to host your own Diaspora server."
       login_here: "log in here"
       ownership: "Eigarskap"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
-      share_what_you_want: "Share what you want, with whom you want."
+      ownership_explanation: "Du eig bileta dine. Det burde du gjera òg etter å ha delt dei. Du har framleis eigarskapen til alt du deler i Diaspora. På det viset har du full kontroll med korleis tinga blir delte."
+      share_what_you_want: "Del kva du vil med kven du vil."
       simplicity: "Simplicity"
       simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
       tagline_first_half: "Share what you want,"
@@ -339,8 +341,8 @@ nn:
     also_commented: 
       few: "%{actors} kommenterte òg %{post_author} si %{post_link}."
       many: "%{actors} kommenterte òg %{post_author} si %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
+      one: "%{actors} kommenterte òg %{post_author} sitt %{post_link}."
+      other: "%{actors} kommenterte òg %{post_author} sitt %{post_link}."
       two: "%{actors} kommenterte òg %{post_author} si %{post_link}."
       zero: "%{actors} also commented on %{post_author}'s %{post_link}."
     also_commented_deleted: 
@@ -359,11 +361,11 @@ nn:
       zero: "%{actors} kommenterte %{post_link} ditt."
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
+        few: "%{count} nye varsel"
+        many: "%{count} nye varsel"
         one: "1 nytt varsel"
-        other: "%{count} new notifications"
-        two: "%{count} new notifications"
+        other: "%{count} nye varsel"
+        two: "%{count} nye varsel"
         zero: "Ingen nye varsel"
     index: 
       and: "og"
@@ -377,12 +379,12 @@ nn:
       mark_all_as_read: "Merk alle som lesne"
       notifications: "Varsel"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      two: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} har likt %{post_link} ditt."
+      many: "%{actors} har likt %{post_link} ditt."
+      one: "%{actors} har likt %{post_link} ditt."
+      other: "%{actors} har likt %{post_link} ditt."
+      two: "%{actors} har likt %{post_link} ditt."
+      zero: "%{actors} har likt %{post_link} ditt."
     liked_post_deleted: 
       few: "%{actors} likte det sletta innlegget ditt."
       many: "%{actors} likte det sletta innlegget ditt."
@@ -391,34 +393,34 @@ nn:
       two: "%{actors} likte det sletta innlegget ditt."
       zero: "%{actors} likte det sletta innlegget ditt."
     mentioned: 
-      few: "%{actors} har nemnt dykk i eit %{post_link}."
-      many: "%{actors} har nemnt dykk i eit %{post_link}."
+      few: "%{actors} har nemnt deg i eit %{post_link}."
+      many: "%{actors} har nemnt deg i eit %{post_link}."
       one: "%{actors} har nemnt deg i eit %{post_link}."
-      other: "%{actors} har nemnt dei i eit %{post_link}."
-      two: "%{actors} har nemnt dykk i eit %{post_link}."
+      other: "%{actors} har nemnt deg i eit %{post_link}."
+      two: "%{actors} har nemnt deg i eit %{post_link}."
       zero: "%{actors} har nemnt deg i eit %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      two: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
+      few: "%{actors} nemnde deg i eit sletta innlegg."
+      many: "%{actors} nemnde deg i eit sletta innlegg."
+      one: "%{actors} nemnde deg i eit sletta innlegg."
+      other: "%{actors} nemnde deg i eit sletta innlegg."
+      two: "%{actors} nemnde deg i eit sletta innlegg."
+      zero: "%{actors} nemnde deg i eit sletta innlegg."
     post: "innlegg"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      two: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} sende deg ei melding."
+      many: "%{actors} sende deg ei melding."
+      one: "%{actors} sende deg ei melding."
+      other: "%{actors} sende deg ei melding."
+      two: "%{actors} sende deg ei melding."
+      zero: "%{actors} sende deg ei melding."
     reshared: 
-      few: "%{actors} has reshared your %{post_link}."
-      many: "%{actors} has reshared your %{post_link}."
-      one: "%{actors} has reshared your %{post_link}."
-      other: "%{actors} has reshared your %{post_link}."
-      two: "%{actors} has reshared your %{post_link}."
-      zero: "%{actors} has reshared your %{post_link}."
+      few: "%{actors} har delt %{post_link} ditt."
+      many: "%{actors} har delt %{post_link} ditt."
+      one: "%{actors} har delt %{post_link} ditt."
+      other: "%{actors} har delt %{post_link} ditt."
+      two: "%{actors} har delt %{post_link} ditt."
+      zero: "%{actors} har delt %{post_link} ditt."
     reshared_post_deleted: 
       few: "%{actors} delte på nytt den sletta posten din."
       many: "%{actors} delte på nytt den sletta posten din."
@@ -444,7 +446,7 @@ nn:
     email_sent_by_diaspora: "Diaspora sende denne e-postmeldinga.  Om du ikkje lenger ønskjer å få slike meldingar,"
     hello: "Hei %{name}!"
     liked: 
-      liked: "%{name} likte nettopp innlegget ditt"
+      liked: "%{name} likte innlegget ditt"
       view_post: "Syn innlegget >"
     mentioned: 
       mentioned: "nemnde deg i eit innlegg:"
@@ -452,7 +454,7 @@ nn:
     private_message: 
       reply_to_or_view: "Svar på eller syn denne samtalen >"
     reshared: 
-      reshared: "%{name} har nettopp delt innlegget ditt"
+      reshared: "%{name} har delt innlegget ditt"
       view_post: "Syn innlegget >"
     single_admin: 
       admin: "Diaspora-administratoren din"
@@ -604,7 +606,7 @@ nn:
       unhappy: "Ulukkeleg?"
       update: "Oppdater"
     new: 
-      create_my_account: "Lag kontoen min"
+      create_my_account: "Lag kontoen min."
       enter_email: "Skriv ei e-postadresse"
       enter_password: "Skriv passordet"
       enter_password_again: "Skriv passordet éin gong til"
@@ -635,23 +637,25 @@ nn:
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Klarte ikkje å dela dette innlegget på nytt."
     reshare: 
-      deleted: "Original post deleted by author."
+      deleted: "Forfattaren har sletta originalinnlegget."
       reshare: 
         few: "%{count} reshares"
         many: "%{count} reshares"
         one: "1 reshare"
         other: "%{count} reshares"
         two: "%{count} reshares"
-        zero: "Reshare"
+        zero: "Del vidare"
       reshare_confirmation: "Reshare %{author}'s post?"
-      reshare_original: "Reshare original"
+      reshare_original: "Del originalen vidare"
       reshared_via: "reshared via"
-      show_original: "Show original"
+      show_original: "Syn original"
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Vellukka autentisering."
     destroy: 
       success: "Sletta autentiseringa."
@@ -711,15 +715,22 @@ nn:
     notification: 
       new: "Ny %{type} frå %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logga på %{service}"
       manage: "handsama tilkopla tenester"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Andre utanfor Diaspora vil kunna sjå dei offentlege meldingane."
+      share: "Share"
       title: "Setja opp tilkopla tenester"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "alle"
       all_contacts: "alle kontaktane"
       discard_post: "Forkast innlegget"
       make_public: "gjer offentlig"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Send ei melding til %{aspect}"
       posting: "Sender …"
       publishing_to: "publiserer til:"
@@ -730,6 +741,8 @@ nn:
     reshare: 
       reshare: "Del på nytt"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Mislik"
       hide_and_mute: "Gøym og demp"
       like: "Lik"
@@ -763,13 +776,15 @@ nn:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
     mentions: 
       contacts_title: "People who mentioned you"
-      title: "Your Mentions"
+      title: "@Nemningar"
     multi: 
       contacts_title: "People in your Stream"
       title: "Stream"
@@ -779,11 +794,11 @@ nn:
       title: "Public Activity"
     recently: "recently:"
     tags: 
-      contacts_title: "People who dig these tags"
+      contacts_title: "Personar som elskar denne etiketten"
       title: "Posts tagged: %{tags}"
   tag_followings: 
     create: 
-      failure: "Failed to follow: #%{name}"
+      failure: "Klarte ikkje å følgja: #%{name}"
       success: "Successfully following: #%{name}"
     destroy: 
       failure: "Failed to stop following: #%{name}"
@@ -831,52 +846,32 @@ nn:
       edit_account: "Endra kontoen"
       email_awaiting_confirmation: "Vi har sendt ei aktiveringslenkje til %{unconfirmed_email}. Vi vil halda fram med å senda til originaladressa di, %{email}, fram til du følgjer lenkja og tek i bruk den nye."
       export_data: "Eksporter data"
+      getting_started: "New User Prefrences"
       liked: "… nokon liker innlegget ditt?"
       mentioned: "… du er nemnt i eit innlegg?"
       new_password: "Nytt passord"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "… du mottek ei privat melding?"
       receive_email_notifications: "Få e-postvarsel når …"
       reshared: "… nokon deler innlegget ditt vidare?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "… nokon byrjar å dela med deg?"
       stream_preferences: "Stream Preferences"
       your_email: "E-posten din"
       your_handle: "Diaspora-ID-en din"
     getting_started: 
-      bold: "aspekta"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Kopla til"
-      connect_to_your_other_social_networks: "Kopla til dei andre sosiale nettverka dine"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Møt kjekke folk"
-      connect_with_people_explanation_pt1: "Knyt deg til folk ved å plassera dei i eitt eller fleire av %{bold} dine."
-      connect_with_people_explanation_pt2: "Aspekt er ein intuitiv måte å gruppera nye og kjente fjes. Inndelinga er synleg berre for deg og gjer at du enkelt kan filtrera eller dela med forskjellige undergrupper av kontaktane dine."
-      edit_profile: "Endra profilen"
-      featured_tags: "Følg framheva etikettar"
-      fill_out_your_profile: "Fyll ut profilen din"
-      find_friends: "Finn vener"
-      find_friends_from_facebook: "finn vener frå Facebook"
-      finished: "Ferdig"
-      follow_your_interests: "Følg interessene dine"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Grindmerke (#) gjer at du kan tala om og følgja interessene dine. Dei er òg ein fin måte å finna nye Diaspora-brukarar på."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Gjer det lettare for folk å finna deg ved at du fyller inn profilopplysningane dine."
-      profile_fields: 
-        bio: "Livshistorie"
-        birthday: "Fødselsdag"
-        gender: "Kjønn"
-        location: "Stad"
-        name: "Namn"
-        photo: "Bilete"
-        tags: "Etikettar"
-      search_for_hashtags: "Søk etter #grindmerke"
-      search_for_people: "Søk etter personar"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Velkomen"
-      welcome_with_name: "Velkomen %{name}."
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ nn:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 52b87b48c..00709cbef 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -64,6 +64,9 @@ pa:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ pa:
       aspect_not_empty: "Aspect not empty"
       remove: "ਹਟਾਓ"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ pa:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ pa:
   search: "ਖੋਜ"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ pa:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "You are about to post a public message!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "ਸਭ"
       all_contacts: "ਸਭ ਸੰਪਰਕਾਂ ਨਾਲ"
       discard_post: "Discard post"
       make_public: "ਪਬਲਿਕ ਬਣਾਓ"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ pa:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ pa:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ pa:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "ਪੂਰਾ ਹੋਇਆ!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "ਦਿਸਪੋਰਾ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ pa:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index a6080726d..20b3480af 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -64,6 +64,9 @@ pl:
       deselect_all: "Odznacz wszystkie"
       edit_aspect: "Edycja %{name}"
       select_all: "Zaznacz wszystkie"
+    aspect_stream: 
+      stay_updated: "Bądź na bieżąco"
+      stay_updated_explanation: "Główny strumień jest wypełniony przez wszystkie Twoje kontakty, znaczniki które obserwujesz i wpisy które niektórych bardziej kreatywnych członków społeczności."
     contacts_not_visible: "Kontakty z tego aspektu nie będą dla siebie widoczne."
     contacts_visible: "Kontakty z tego aspektu będą widziały się nawzajem."
     create: 
@@ -89,7 +92,6 @@ pl:
       aspect_not_empty: "Aspekt nie jest pusty"
       remove: "usuń"
     index: 
-      community_spotlight: "W centrum uwagi społeczności"
       cubbies: 
         explanation: "Cubbi.es to pierwsza aplikacja dedykowana projektowi Diaspora."
         heading: "Połącz z Cubbi.es"
@@ -105,23 +107,23 @@ pl:
         email_feedback: "%{link} swoje zgłoszenie, jeśli chcesz"
         feature_and_forum: "%{gs} & %{forum}: Strona wsparcia społeczności i propozycje zmian"
         feature_suggestion: "... masz %{link} sugestie?"
-        find_a_bug: "... znalazłeś błąd %{link}?"
-        have_a_question: "... czy masz pytanie %{link}?"
+        find_a_bug: "... znal@{m:azłeś|f:azłaś|n:eziono} %{link}?"
+        have_a_question: "... masz %{link}?"
         here_to_help: "Społeczności Diaspory jest tutaj!"
         need_help: "Potrzebujesz pomocy?"
         satisfaction: "%{link}: Strona wsparcia społeczności"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Przewodnik po serwisie i najnowsze informacje"
+      introduce_yourself: "Oto Twoj strumień. Wskocz do niego i przedstaw się."
       keep_us_running: "Aby %{pod} działał szybko podaruj serwerom dawkę kofeiny w postaci miesięcznej darowizny!"
       no_contacts: "Brak kontaktów"
       no_tags: "+ Znajdź tag do obserwowania"
       people_sharing_with_you: "Osoby udostępniające Tobie"
       post_a_message: "napisz wiadomość >>"
-      see_more_from_us: "Zobacz więcej społeczności D*."
       services: 
         content: "Z Diasporą można połączyć następujące usługi:"
         heading: "Podłącz usługi"
       unfollow_tag: "Przestań obserwować #%{tag}"
-      welcome: "Witamy"
+      welcome_to_diaspora: "Witaj w Diasporze, %{name}!"
       your_aspects: "Twoje Aspekty"
     many: "Aspekty: %{count}"
     move_contact: 
@@ -130,7 +132,7 @@ pl:
       success: "Osoba została przeniesiona do nowego aspektu"
     new: 
       create: "Stwórz"
-      name: "Imię i nazwisko (widoczne tylko dla Ciebie)"
+      name: "Nazwa (widoczna tylko dla Ciebie)"
     no_contacts_message: 
       community_spotlight: "w centrum uwagi społeczności"
       or_spotlight: "Lub możesz udostępnić z %{link}"
@@ -148,7 +150,7 @@ pl:
     selected_contacts: 
       manage_your_aspects: "Zarządzanie aspektami."
       no_contacts: "Nie masz żadnych kontaktów."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Wyświetl wszystkich w centrum uwagi"
       view_all_contacts: "Wyświetl wszystkie kontakty"
     show: 
       edit_aspect: "edycja aspektu"
@@ -185,7 +187,7 @@ pl:
     few: "%{count} kontakty"
     index: 
       add_a_new_aspect: "Dodaj aspekt"
-      add_to_aspect: "Dodaj kontakty do %{name}"
+      add_to_aspect: "dodaj kontakty do %{name}"
       all_contacts: "Wszystkie kontakty"
       check_out: "Zobacz"
       many_people_are_you_sure: "Czy na pewno chcesz rozpocząć prywatną rozmowę z więcej niż %{suggested_limit} osobami? Możesz po prostu opublikować swoją wiadomość w tej grupie. "
@@ -220,7 +222,7 @@ pl:
         two: "Nowe wiadomości %{count}"
         zero: "Brak nowych wiadomości"
     index: 
-      create_a_new_message: "stwórz nową wiadomość"
+      create_a_new_message: "utwórz nową wiadomość"
       inbox: "Skrzynka odbiorcza"
       message_inbox: "Wiadomości w Skrzynce odbiorczej"
       new_message: "Nowa wiadomość"
@@ -293,7 +295,7 @@ pl:
       to: "Do"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "NAPĘDZANE PRZEZ DIASPORĘ*"
       public_feed: "Publiczny kanał Diaspory użytkownika %{name}"
       toggle: "przełącz widok mobilny"
       whats_new: "co nowego?"
@@ -322,14 +324,14 @@ pl:
         many: "%{count} os. to lubi"
         one: "1 osoba to polubiła"
         other: "%{count} os. to lubi"
-        two: "%{count} os. to lubi"
+        two: "%{count} osoby to lubią"
         zero: "nikt tego nie polubił"
       people_like_this_comment: 
         few: "%{count} os. to lubi"
         many: "%{count} os. to lubi"
-        one: "%{count} os. to lubi"
+        one: "%{count} osoba to lubi"
         other: "%{count} os. to lubi"
-        two: "%{count} os. to lubi"
+        two: "%{count} ososby to lubią"
         zero: "nikt tego nie polubił"
   limited: "Ograniczone"
   more: "Więcej"
@@ -377,12 +379,12 @@ pl:
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: "Powiadomienia"
     liked: 
-      few: "%{actors} polecili twój %{post_link}."
-      many: "%{actors} polecili twój %{post_link}."
-      one: "%{actors} polecił(a) twój %{post_link}."
-      other: "%{actors} polecił(a) twój %{post_link}."
-      two: "%{actors} poleciło twój %{post_link}."
-      zero: "%{actors} polecił twój %{post_link}."
+      few: "%{actors} polubili Twój %{post_link}."
+      many: "%{actors} polubili Twój %{post_link}."
+      one: "%{actors} polubi@{m:ł|f:ła|n:ł} Twój %{post_link}."
+      other: "%{actors} polubi@{m:ł|f:ła|n:ł} Twój %{post_link}."
+      two: "%{actors} polubili Twój %{post_link}."
+      zero: "%{actors} polubił Twój %{post_link}."
     liked_post_deleted: 
       few: "%{actors} polubiły twój usunięty wpis."
       many: "%{actors} lubią twój już usunięty wpis."
@@ -395,8 +397,8 @@ pl:
       many: "%{actors} wspomnieli o Tobie w %{post_link}."
       one: "%{actors} wspomniał(a) o Tobie w %{post_link}."
       other: "%{actors} wspomnieli o Tobie w %{post_link}."
-      two: "%{actors} wspomniało o Tobie w %{post_link}."
-      zero: "%{actors} wspomniał(a) o Tobie w %{post_link}."
+      two: "%{actors} wspomnieli o Tobie w %{post_link}."
+      zero: "%{actors} wspomnia@{m:ł|f:ła|n:ł} o Tobie w %{post_link}."
     mentioned_deleted: 
       few: "%{actors} wspomnieli o tobie w już usuniętym wpisie."
       many: "%{actors} wspomnieli o tobie w już usuniętym wpisie."
@@ -413,12 +415,12 @@ pl:
       two: "%{actors} wysłało ci wiadomość."
       zero: "%{actors} wysłał ci wiadomość."
     reshared: 
-      few: "%{actors} podzielili się twoim wpisem %{post_link}."
-      many: "%{actors} podzieliły się twoim wpisem %{post_link}."
+      few: "%{actors} udostępnili ponownie Twój %{post_link}."
+      many: "%{actors} udostępnili ponownie Twój %{post_link}."
       one: "%{actors} podzielił się twoim wpisem %{post_link}."
-      other: "%{actors} podzielili się twoim %{post_link}."
-      two: "%{actors} podzieliło się twoim wpisem %{post_link}."
-      zero: "%{actors} podzieliło się twoim wpisem %{post_link}."
+      other: "%{actors} udostępnili ponownie Twój %{post_link}."
+      two: "%{actors} udostępnili ponownie Twój %{post_link}."
+      zero: "%{actors} udostępniło ponownie Twój %{post_link}."
     reshared_post_deleted: 
       few: "%{actors} udostępniło ponownie Twój usunięty wpis."
       many: "%{actors} udostępnili ponownie Twój usunięty wpis."
@@ -428,10 +430,10 @@ pl:
       zero: "%{actors} udostępnili ponownie Twój usunięty wpis."
     started_sharing: 
       few: "%{actors} zaczęli Ci udostępniać."
-      many: "%{actors} zaczął Ci udostępniać."
-      one: "%{actors} zaczęli Ci udostępniać."
+      many: "%{actors} zaczęli Ci udostępniać."
+      one: "%{actors} zacz@{m:ął|f:ęła|n:ęło} Ci udostępniać"
       other: "%{actors} zaczęli Ci udostępniać."
-      two: "%{actors} zaczęło Ci udostępniać."
+      two: "%{actors} zaczęli Ci udostępniać"
       zero: "%{actors} zaczęli Ci udostępniać."
   notifier: 
     a_post_you_shared: "wpis."
@@ -444,7 +446,7 @@ pl:
     email_sent_by_diaspora: "Ta wiadomość została wysłana przez Diasporę. Jeśli nie chcesz otrzymywać takich wiadomości,"
     hello: "Cześć %{name}!"
     liked: 
-      liked: "użytkownik %{name} polubił Twój wpis: "
+      liked: "%{name} polubi@{m:ł|f:ła|n:ł} Twój wpis"
       view_post: "Wyświetl wpis >"
     mentioned: 
       mentioned: "wspomniał(a) o Tobie we wpisie:"
@@ -452,7 +454,7 @@ pl:
     private_message: 
       reply_to_or_view: "Odpowiedz lub wyświetl wątek >"
     reshared: 
-      reshared: "%{name} właśnie udostępnił(a) ponownie Twój wpis"
+      reshared: "%{name} udostępni@{m:ł|f:ła|n:ł} ponownie Twój wpis"
       view_post: "Wyświetl wpis >"
     single_admin: 
       admin: "Administrator Diaspory"
@@ -652,6 +654,8 @@ pl:
   search: "Znajdź"
   services: 
     create: 
+      already_authorized: "Użytkownik o identyfikatorze w diasporze \"%{diaspora_id\"} już autoryzował to konto w usłudze \"%{service_name}\"."
+      failure: "Uwierzytelnianie nie powiodło się."
       success: "Pomyślnie uwierzytelniono."
     destroy: 
       success: "Pomyślnie usunięto dane uwierzytelniające."
@@ -711,15 +715,22 @@ pl:
     notification: 
       new: "Nowy(-a,-e) %{type} od %{from}"
     public_explain: 
+      control_your_audience: "Dostosuj swoją publiczność"
       logged_in: "zalogowano do %{service}"
       manage: "zarządzaj powiązanymi usługami"
+      new_user_welcome_message: "Używaj #znaczników, aby opisywać swoje wpisy i znajdować osoby o podobnych zainteresowaniach. Zawołaj ciekawych ludzi dzięki @wzmiankom"
       outside: "Publiczna wiadomość będzie widoczna dla wszystkich spoza Diaspory."
+      share: "Podziel się"
       title: "Konfiguracja połączonych usług"
+      visibility_dropdown: "Użyj tej listy rozwijalnej, aby zmienić widoczność swojego wpisu.  (Proponujemy, aby ten pierwszy był publiczny.)"
     publisher: 
       all: "wszyscy"
       all_contacts: "wszystkim kontaktom"
       discard_post: "Porzuć wpis"
       make_public: "upublicznij"
+      new_user_prefill: 
+        hello: "Witajcie wszyscy, jestem #%{new_user_tag}. "
+        i_like: "Interesują mnie %{tags}."
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Publikowanie..."
       publishing_to: "publikuj na:"
@@ -730,6 +741,8 @@ pl:
     reshare: 
       reshare: "Podziel się ponownie"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Nie lubię"
       hide_and_mute: "Ukryj i wycisz"
       like: "Lubię"
@@ -755,15 +768,17 @@ pl:
       zero: "skróć swoje wiadomości statusowe do mniej niż %{count} znaków"
   stream_helper: 
     hide_comments: "Ukryj wszystkie komentarze"
-    show_more_comments: "Pokaż kolejne %{number} komentarze"
+    show_more_comments: "Wyświetl więcej komentarzy - %{number}"
   streams: 
     aspects: 
       title: "Twoje Aspekty"
     aspects_stream: "Aspekty"
-    commented_on: "skomentowa@{m:ł|f:ła|n:no}"
+    commented_on: "komentowane"
     community_spotlight_stream: "W centrum uwagi społeczności"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "Osoby które wykopały te tagi"
+      follow: "Follow"
       title: "#Obserwowane tagi"
     followed_tags_stream: "#Obserwowane tagi"
     mentioned_stream: "@Wzmianki"
@@ -818,65 +833,45 @@ pl:
       email_not_confirmed: "Nie można aktywować adresu e-mail. Nieprawidłowe łącze?"
     destroy: "Konto zostało zablokowane. Dokończenie zamykania konta może nam zająć do 20 minut. Dziękujemy za wypróbowanie Diaspory."
     edit: 
-      also_commented: "...ktoś także skomentuje wpis jednego z z moich kontaktów?"
+      also_commented: "...ktoś także skomentuje wpis jednego z z moich kontaktów"
       change: "Zmień"
       change_email: "Zmiana adresu e-mail"
       change_language: "Zmiana języka"
       change_password: "Zmiana hasła"
       close_account: "Zamknij konto"
-      comment_on_post: "...ktoś dodał komentarz do mojego wpisu?"
+      comment_on_post: "...ktoś dodał komentarz do mojego wpisu"
       current_password: "Bieżące hasło"
       download_photos: "pobierz moje zdjęcia"
       download_xml: "pobierz mój xml"
       edit_account: "Edycja konta"
       email_awaiting_confirmation: "Łącze aktywacyjne zostało wysłany na adres \"%{unconfirmed_email}\". Do momentu kliknięcia łącza i aktywacji nowego adresu, nadal będziemy korzystać z obecnego \"%{email}\"."
       export_data: "Eksport danych"
-      liked: "...ktoś polubił mój wpis?"
-      mentioned: "...ktoś o mnie wspomniał we wpisie?"
+      getting_started: "Preferencje nowego użytkownika"
+      liked: "...ktoś polubił mój wpis"
+      mentioned: "...ktoś o mnie wspomniał we wpisie"
       new_password: "Nowe hasło"
-      private_message: "...otrzymam prywatną wiadomość?"
+      photo_export_unavailable: "Photo exporting currently unavailable"
+      private_message: "...otrzymam prywatną wiadomość"
       receive_email_notifications: "Wysyłaj powiadomienia e-mail jeśli..."
-      reshared: "...ktoś ponownie udostępnił mój post?"
+      reshared: "...ktoś ponownie udostępnił mój post"
       show_community_spotlight: "Wyświetlić osoby w centrum uwagi społeczności w Strumieniu?"
-      started_sharing: "...ktoś zaczął mi coś udostępniać?"
+      show_getting_started: "Ponownie włącz - Pierwsze kroki"
+      started_sharing: "...ktoś zaczął mi coś udostępniać"
       stream_preferences: "Ustawienia Strumienia"
       your_email: "Adres e-mail"
       your_handle: "Identyfikator Diaspory"
     getting_started: 
-      bold: "aspekty"
-      community_spotlight: "W centrum uwagi społeczności"
+      awesome_take_me_to_diaspora: "Świetnie! Zabierz mnie do Diaspory*"
       community_welcome: "Społeczności Diaspory cieszy się, że ​​jesteś na pokładzie!"
-      connect_to: "Połącz z"
-      connect_to_your_other_social_networks: "Połącz z innymi serwisami społecznościowymi"
-      connect_to_your_other_social_networks_explanation_p1: "Połączenie usług umożliwia publikowanie w nich treści."
-      connect_to_your_other_social_networks_explanation_p2: "Z Facebookiem, możesz również odnaleźć swoich znajomych posiadających konta na Diasporze i zaprosić innych."
-      connect_with_people: "Nawiąż kontakt z ciekawymi osobami"
-      connect_with_people_explanation_pt1: "Łącz się z ludźmi poprzez umieszczenie ich w jednym lub więcej %{bold}."
-      connect_with_people_explanation_pt2: "Aspekty to intuicyjny sposób dyskretnego grupowania nowych i już znanych osób, umożliwiający filtrowanie lub udostępnianie treści tylko wybranym grupom osób."
-      edit_profile: "Edycja profilu"
-      featured_tags: "Obserwuj interesujące tagi"
-      fill_out_your_profile: "Wypełnij swój profil"
-      find_friends: "Znajdź znajomych"
-      find_friends_from_facebook: "znajdź znajomych z Facebooka"
-      finished: "Gotowe"
-      follow_your_interests: "Poszukaj swoich zainteresowań"
-      get_updates_from_core: "Uzyskuj najnowsze wieści o projekcie od jego twórców."
       hashtag_explanation: "Tagi pozwalają łatwo odnaleźć interesujące Cię tematy. Są także świetnym sposobem na nawiązywanie znajomości na Diasporze."
-      not_mandatory: "Wykonanie następujących kroku poprawi doświadczanie Diaspory, ale nie jest to konieczne."
-      profile_description: "Ułatw innym znalezienie Ciebie, wypełniając informacje profilowe."
-      profile_fields: 
-        bio: "Nota biograficzna"
-        birthday: "Urodziny"
-        gender: "Płeć"
-        location: "Lokalizacja"
-        name: "Imię"
-        photo: "Zdjęcie"
-        tags: "Tagi"
-      search_for_hashtags: "Szukaj #tagów"
-      search_for_people: "Znajdź osoby"
-      see_all_community_spotlight: "Wyświetl wszystkich w centrum uwagi społeczności"
-      welcome: "Witaj!"
-      welcome_with_name: "Witaj, %{name}!"
+      hashtag_suggestions: "Spróbuj obserwować znaczniki takie jak #sztuka, #filmy, #gif, itd."
+      hooking_up_fb: "podpinanie Twojego konta na Facebooku"
+      saved: "Zapisano!"
+      we_can_speed_things_up: "Możemy przyspieszyć nieco dzięki"
+      well_hello_there: "No, witam!"
+      what_are_you_in_to: "Czym się interesujesz?"
+      what_facebook_does: "do Diaspory. Zostanie pobrane Twoje imię, nazwisko i zdjęcie, oraz zostanie uruchomione wzajemne publikowanie."
+      who_are_you: "Kim jesteś?"
     logged_out: 
       go_mobile: "Teraz na urządzeniach przenośnych."
       on_your_mobile_device: "na urządzeniu przenośnym by mieć dostęp do mobilnej wersji Diaspory*"
@@ -901,3 +896,4 @@ pl:
     no_person_constructed: "Nie udało się utworzyć osoby używając tego zbioru hcard."
     not_enabled: "Usługa Webfinger nie działa w systemie utrzymującym konto użytkownika %{account}"
     xrd_fetch_failed: "wystąpił błąd podczas pobierania xrd z konta %{account}"
+  welcome: "Witamy!"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index e20df25fd..37af1881c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -64,6 +64,9 @@ pt-BR:
       deselect_all: "Desmarcar tudo"
       edit_aspect: "Editar %{name}"
       select_all: "Selecionar tudo"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contatos neste aspecto não podem visualizar uns aos outros."
     contacts_visible: "Contatos neste aspecto não visualizarão uns aos outros."
     create: 
@@ -89,7 +92,6 @@ pt-BR:
       aspect_not_empty: "Aspecto não está vazio"
       remove: "remover"
     index: 
-      community_spotlight: "Comunidade Spotlight"
       cubbies: 
         explanation: "Cubbi.es é a primeira aplicação desenvolvida para Diaspora."
         heading: "Conecte-se em Cubbi.es"
@@ -111,17 +113,17 @@ pt-BR:
         need_help: "Quer Ajuda?"
         satisfaction: "%{link}: Comunidade de suporte"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriais Comunitários, Como fazer, e Notícias"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Mantenha %{pod} rodando mais rápido, comprando nossos servidores e garantindo o nosso café mensal!"
       no_contacts: "Sem contatos"
       no_tags: "+ Procurar tag para seguir"
       people_sharing_with_you: "Pessoas compartilhando com você"
       post_a_message: "postar uma mensagem >>"
-      see_more_from_us: "Ver mais da comunidade D*."
       services: 
         content: "Você pode conectar e seguir estes serviços em Diaspora:"
         heading: "Conectar Serviços"
       unfollow_tag: "Parar de seguir #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Seus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -652,6 +654,8 @@ pt-BR:
   search: "Busca"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Sucesso na autenticação."
     destroy: 
       success: "Autenticação deletada com sucesso."
@@ -711,15 +715,22 @@ pt-BR:
     notification: 
       new: "Novo %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "Entrou no %{service}"
       manage: "Gerenciar serviços conectados"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Mensagens públicas são visualizadas por todos que estão fora de Diaspora."
+      share: "Share"
       title: "Configurar serviços conectados"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "todos"
       all_contacts: "Todos os contatos"
       discard_post: "Descartar postagem"
       make_public: "Tornar público"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Postar uma mensagem para %{aspect}"
       posting: "Postando..."
       publishing_to: "publicando para:"
@@ -730,6 +741,8 @@ pt-BR:
     reshare: 
       reshare: "Compartilhar"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Descurtir"
       hide_and_mute: "Ocultar e Silenciar"
       like: "Curtir"
@@ -763,7 +776,9 @@ pt-BR:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ pt-BR:
       edit_account: "Editar Conta"
       email_awaiting_confirmation: "Temos que lhe enviar um link para a confirmação do email %{unconfirmed_email}. Enquanto você não confirmar o seu novo endereço de email, nós continuaremos utilizando o endereço antigo: %{email}."
       export_data: "Exportar Dados"
+      getting_started: "New User Prefrences"
       liked: "...alguém curtir a sua postagem?"
       mentioned: "...for mencionado(a) em uma postagem?"
       new_password: "Nova Senha"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...você receber uma mensagem privada?"
       receive_email_notifications: "Receber notificações por email quando..."
       reshared: "...alguém compartilhar a sua postagem?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...alguém começou a compartilhar com você?"
       stream_preferences: "Stream Preferences"
       your_email: "Seu Email"
       your_handle: "Sua Diaspora ID"
     getting_started: 
-      bold: "aspectos"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Conecte-se para"
-      connect_to_your_other_social_networks: "Conectar as suas outras redes sociais"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Conectar com pessoas legais"
-      connect_with_people_explanation_pt1: "Conectar-se com as pessoas, colocando-as em um ou mais dos seus %{bold}"
-      connect_with_people_explanation_pt2: "Os aspectos são uma forma intuitiva de criar novos grupos, compartilhar gostos, idéias e outros que podem se tornarem tanto públicos como também privados. E é possível filtrar e compartilhar com os subconjuntos dos seus contatos facilmente."
-      edit_profile: "Editar Perfil"
-      featured_tags: "Tags destacadas"
-      fill_out_your_profile: "Preencha teu perfil"
-      find_friends: "Procurar amigos"
-      find_friends_from_facebook: "Procurar amigos do Facebook"
-      finished: "Finalizado!"
-      follow_your_interests: "Siga teus interesses"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "As hashtags permitem à você compartilhar e acompanhar os teus interesses. Elas também são uma ótima maneira de encontrar novas pessoas em Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Se torne mais fácil de ser encontrado(a) pelas pessoas, preenchendo todas as informações do teu perfil."
-      profile_fields: 
-        bio: "Biografia"
-        birthday: "Aniversário"
-        gender: "Sexo"
-        location: "Localização"
-        name: "Nome"
-        photo: "Foto"
-        tags: "Tags"
-      search_for_hashtags: "Buscar por #hashtags"
-      search_for_people: "Buscar Pessoas"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Bem vindo(a)!"
-      welcome_with_name: "Bem vindo(a), %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "em seu dispositivo móvel para acessar Diáspora* móvel."
@@ -901,3 +896,4 @@ pt-BR:
     no_person_constructed: "Não foi possível construir uma pessoa a partir deste hcard."
     not_enabled: "O webfinger parece não estar habilitado para o servidor %{account}"
     xrd_fetch_failed: "Ocorreu um problema ao obter o xrd da conta %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index e5a0268da..b2f45602f 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -61,9 +61,12 @@ pt-PT:
       done_editing: "finalizar edição"
     aspect_listings: 
       add_an_aspect: "+ Adicionar um aspecto"
-      deselect_all: "Deselect all"
-      edit_aspect: "Edit %{name}"
-      select_all: "Select all"
+      deselect_all: "Anular todos"
+      edit_aspect: "Alterar %{name}"
+      select_all: "Seleccionar todos"
+    aspect_stream: 
+      stay_updated: "Mantenha-se Actualizado"
+      stay_updated_explanation: "Na sua stream geral pode encontrar todos os seus contactos, as tags que segue e publicações de alguns membros criativos da comunidade."
     contacts_not_visible: "Contactos neste aspecto não se verão uns aos outros."
     contacts_visible: "Contactos neste aspecto ver-se-ão uns aos outros."
     create: 
@@ -89,7 +92,6 @@ pt-PT:
       aspect_not_empty: "Aspecto não vazio"
       remove: "remover"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es é a primeira aplicação do Diaspora sobre desenvolvimento."
         heading: "Ligar ao Cubbi.es"
@@ -101,27 +103,27 @@ pt-PT:
       donate: "Doar"
       handle_explanation: "Esta é a sua identificação do Diaspora. Tal como um endereço de email, pode dá-la a quem deseja que o contacte."
       help: 
-        do_you: "Do you:"
-        email_feedback: "%{link} your feedback, if you prefer"
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
+        do_you: "Quer:"
+        email_feedback: "%{link} o teu feedback, se preferires"
+        feature_and_forum: "%{gs} & %{forum}: Apoio da Comunidade e pedidos de novos recursos"
         feature_suggestion: "... uma sugestão de %{link}?"
         find_a_bug: "... um %{link} para relatar?"
         have_a_question: "... uma %{link}?"
         here_to_help: "A comunidade do Diaspora está aqui!"
         need_help: "Precisa de ajuda?"
-        satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        satisfaction: "%{link}: Apoio da comunidade"
+        tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriais da comunidade, how-to, e notícias"
+      introduce_yourself: "Este é o seu stream.  Venha daí e apresente-se."
       keep_us_running: "Mantenha o %{pod} a funcionar rapidamente e compre aos servidores a sua dose de café com uma doação mensal!"
       no_contacts: "Não há contactos"
       no_tags: "+ Encontre uma tag para seguir"
       people_sharing_with_you: "Pessoas a partilhar consigo"
       post_a_message: "publicar uma mensagem >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Pode conectar os seguintes serviços ao Diaspora:"
         heading: "Conectar Serviços"
       unfollow_tag: "Deixar de seguir #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Bem-vindo ao Diaspora, %{name}!"
       your_aspects: "Os Seus Aspectos"
     many: "%{count} aspectos"
     move_contact: 
@@ -132,8 +134,8 @@ pt-PT:
       create: "Create"
       name: "Nome (apenas visível para si)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "destaque da comunidade"
+      or_spotlight: "Ou podes partilhar com %{link}"
       try_adding_some_more_contacts: "Pode pesquisar (acima) ou convidar (à direita) mais contactos."
       you_should_add_some_more_contacts: "Devia adicionar mais alguns contactos!"
     no_posts_message: 
@@ -148,7 +150,7 @@ pt-PT:
     selected_contacts: 
       manage_your_aspects: "Gerir os seus aspectos"
       no_contacts: "Ainda não tem quaisquer aspectos aqui."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Ver todos os destaques da comunidade"
       view_all_contacts: "Ver todos os contactos"
     show: 
       edit_aspect: "editar aspecto"
@@ -185,9 +187,9 @@ pt-PT:
     few: "%{count} contactos"
     index: 
       add_a_new_aspect: "Adicionar um novo aspecto"
-      add_to_aspect: "Add contacts to %{name}"
+      add_to_aspect: "Adicionar contactos a %{name}"
       all_contacts: "Todos os Contactos"
-      check_out: "Check out"
+      check_out: "Veja"
       many_people_are_you_sure: "Tem a certeza de que deseja começar um conversa privada com mais de %{suggested_limit} contactos? Publicar para este aspecto pode ser uma forma melhor de os contactar."
       my_contacts: "Os Meus Contactos"
       no_contacts: "Parece que precisa de adicionar alguns contactos."
@@ -202,7 +204,7 @@ pt-PT:
     sharing: 
       people_sharing: "Pessoas a partilhar consigo:"
     spotlight: 
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Destaque da Comunidade"
     two: "%{count} contactos"
     zero: "contactos"
   conversations: 
@@ -586,12 +588,12 @@ pt-PT:
       updated: "Perfil actualizado"
   public: "Público"
   reactions: 
-    few: "%{count} reactions"
-    many: "%{count} reactions"
-    one: "1 reaction"
-    other: "%{count} reactions"
-    two: "%{count} reactions"
-    zero: "0 reactions"
+    few: "%{count} reacções"
+    many: "%{count} reacções"
+    one: "1 reacção"
+    other: "%{count} reacções"
+    two: "%{count} reacções"
+    zero: "0 reacções"
   registrations: 
     closed: "Os registos estão encerrados neste pod do Diaspora."
     create: 
@@ -610,7 +612,7 @@ pt-PT:
       enter_password_again: "Introduza de novo a mesma palavra-passe"
       enter_username: "Escolha um nome de utilizador (apenas letras, números e underscores)"
       join_the_movement: "Junte-se ao movimento!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "A Rede Social com <3"
   requests: 
     create: 
       sending: "A enviar"
@@ -647,11 +649,13 @@ pt-PT:
         zero: "Repartilhar"
       reshare_confirmation: "Repartilhar a publicação de %{author}?"
       reshare_original: "Repartilha original"
-      reshared_via: "reshared via"
+      reshared_via: "repartilhar via"
       show_original: "Mostrar original"
   search: "Procurar"
   services: 
     create: 
+      already_authorized: "Um utilizador com o id diaspora %{diaspora_id} já autorizou essa %{service_name} conta."
+      failure: "Autenticação falhada. "
       success: "A autentificação foi bem sucedida."
     destroy: 
       success: "A autentificação foi destruída com sucesso."
@@ -711,15 +715,22 @@ pt-PT:
     notification: 
       new: "Novo %{type} de %{from}"
     public_explain: 
+      control_your_audience: "Controle o seu Público"
       logged_in: "Sessão iniciada em %{service}"
       manage: "gerir serviços conectados"
+      new_user_welcome_message: "Utilize #hashtags para classificar as suas publicações e encontrar pessoas que partilham dos mesmos interesses.  Chame por outras pessoas através de @Mentions"
       outside: "As mensagens públicas ficarão visíveis a pessoas fora do Diaspora."
+      share: "Partilhar"
       title: "Configurar serviços conectados"
+      visibility_dropdown: "Utilize esta lista para alterar as opções de visibilidade da sua publicação.  (Sugerimos que a sua primeira seja pública.)"
     publisher: 
       all: "tudo"
       all_contacts: "todos os contactos"
       discard_post: "Rejeitar a publicação"
       make_public: "tornar público"
+      new_user_prefill: 
+        hello: "Olá a todos, o meu nome é #%{new_user_tag}. "
+        i_like: "Estou interessado em %{tags}."
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
       publishing_to: "publicando para:"
@@ -730,6 +741,8 @@ pt-PT:
     reshare: 
       reshare: "Voltar a partilhar"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Não gosto"
       hide_and_mute: "Esconder e Silenciar"
       like: "Gosto"
@@ -758,29 +771,31 @@ pt-PT:
     show_more_comments: "Mostrar %{number} mais contactos"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Os Teus Aspectos"
+    aspects_stream: "Aspectos"
+    commented_on: "comentou no"
+    community_spotlight_stream: "Destaque da Comunidade"
     followed_tag: 
-      contacts_title: "People who dig these tags"
+      add_a_tag: "Add a tag"
+      contacts_title: "Pessoas que gostam destas marcações"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
     mentions: 
-      contacts_title: "People who mentioned you"
+      contacts_title: "Pessoas que o mencionaram"
       title: "Your Mentions"
     multi: 
-      contacts_title: "People in your Stream"
+      contacts_title: "Pessoas no seu Stream"
       title: "Stream"
-    posted: "posted"
+    posted: "publicado"
     public: 
-      contacts_title: "Recent Posters"
-      title: "Public Activity"
-    recently: "recently:"
+      contacts_title: "Cartazes Recentes"
+      title: "Actividade Geral"
+    recently: "recentemente:"
     tags: 
       contacts_title: "People who dig these tags"
-      title: "Posts tagged: %{tags}"
+      title: "Publicações marcadas: %{tags}"
   tag_followings: 
     create: 
       failure: "Falhou ao seguir: #%{name}"
@@ -791,7 +806,7 @@ pt-PT:
   tags: 
     show: 
       follow: "Seguir #%{tag}"
-      followed_by: "followed by"
+      followed_by: "seguido por"
       following: "A seguir #%{tag}"
       nobody_talking: "Ainda ninguém está a falar sobre %{tag}."
       people_tagged_with: "Pessoas com a %{tag}"
@@ -831,58 +846,38 @@ pt-PT:
       edit_account: "Editar conta"
       email_awaiting_confirmation: "Enviámos-lhe uma hiperligação de activação para %{unconfirmed_email}. Até que siga esta hiperligação e active o novo endereço, continuaremos a utilizar o seu endereço original %{email}."
       export_data: "Exportar Dados"
+      getting_started: "Novas Preferências de Utilizador"
       liked: "...alguém gosta da sua publicação?"
       mentioned: "...é mencionado numa publicação?"
       new_password: "Nova palavra-passe"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...recebe uma mensagem privada?"
       receive_email_notifications: "Receber notificações por email quando..."
       reshared: "...alguém repartilha a sua publicação?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Mostrar Destaque da Comunidade no Stream?"
+      show_getting_started: "Re- activar Como Começar"
       started_sharing: "...alguém começa a partilhar consigo?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Preferências de Stream"
       your_email: "O seu endereço de email"
       your_handle: "A sua identificação do Diaspora"
     getting_started: 
-      bold: "aspectos"
-      community_spotlight: "Community spotlight"
-      community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Conectar a"
-      connect_to_your_other_social_networks: "Conecte-se às suas outras redes sociais"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Ligue-se a pessoas interessantes"
-      connect_with_people_explanation_pt1: "Ligue-se a pessoas ao colocá-las em um ou mais dos seus %{bold}."
-      connect_with_people_explanation_pt2: "Aspectos são uma forma intuitiva de agrupar rostos novos e familiares, de forma privada, permitindo-lhe filtrar ou partilhar com subconjuntos dos seus contactos facilmente."
-      edit_profile: "Editar o Perfil"
-      featured_tags: "Seguir tags destacadas"
-      fill_out_your_profile: "Preencha o seu perfil"
-      find_friends: "Encontrar amigos"
-      find_friends_from_facebook: "encontre amigos do Facebook"
-      finished: "Terminado"
-      follow_your_interests: "Siga os seus interesses"
-      get_updates_from_core: "Get updates about the project from the core team."
+      awesome_take_me_to_diaspora: "Excelente! Quero ir para o Diaspora*"
+      community_welcome: "A comunidade do Diaspora está feliz por o ter consigo!"
       hashtag_explanation: "Hashtags permitem-lhe falar sobre e seguir os seus interesses.  Também são uma óptima forma de conhecer novas pessoas no Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Ajude as pessoas a encontrá-lo preenchendo a sua informação de perfil."
-      profile_fields: 
-        bio: "Biografia"
-        birthday: "Data de nascimento"
-        gender: "Sexo"
-        location: "Localização"
-        name: "Nome"
-        photo: "Fotografia"
-        tags: "Tags"
-      search_for_hashtags: "Procurar #hashtags"
-      search_for_people: "Procurar pessoas"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Bem-vindo(a)!"
-      welcome_with_name: "Bem-vindo(a), %{name}!"
+      hashtag_suggestions: "Siga tage como #arte, #cinema, #gif, etc."
+      hooking_up_fb: "ligar à sua conta de Facebook"
+      saved: "Guardado!"
+      we_can_speed_things_up: "Podemos acelerar as coisas um pouco mais ao"
+      well_hello_there: "Oh, olá!"
+      what_are_you_in_to: "O que gostas mais?"
+      what_facebook_does: "para o Diaspora. Isto irá buscar o seu nome e fotografia, e activar a publicação automática noutras plataformas."
+      who_are_you: "Quem és tu?"
     logged_out: 
-      go_mobile: "Now go mobile."
-      on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
-      signed_out: "You've signed out of Diaspora*"
-      simply_visit: "Simply visit"
-      works_on_modern: "Works on all modern smartphones"
+      go_mobile: "Agora no seu telemóvel."
+      on_your_mobile_device: "no seu dispositivo móvel para aceder ao Diaspora* mobile."
+      signed_out: "Você saiu do Diaspora*"
+      simply_visit: "Visite"
+      works_on_modern: "Funciona em todos os recentes smartphones"
     public: 
       does_not_exist: "O utilizador %{username} não existe!"
     update: 
@@ -891,8 +886,8 @@ pt-PT:
       language_not_changed: "Falha ao alterar o idioma"
       password_changed: "A palavra-passe foi alterada. Já pode iniciar sessão com a sua nova palavra-passe."
       password_not_changed: "Falhou ao alterar a palavra-passe"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Actualização das configurações falhada"
+      settings_updated: "Configurações actualizadas"
       unconfirmed_email_changed: "O endereço de email foi alterado. É necessária activação."
       unconfirmed_email_not_changed: "A mudança de email falhou"
   webfinger: 
@@ -901,3 +896,4 @@ pt-PT:
     no_person_constructed: "Nenhuma pessoa pôde ser construída através deste hcard."
     not_enabled: "webfinger parece não estar activado para o anfitrião de %{account}"
     xrd_fetch_failed: "ocorreu um erro ao obter o xrd da conta %{account}"
+  welcome: "Bem-vindo(a)!"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 30cee0ae2..0937a7587 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -64,6 +64,9 @@ ro:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ ro:
       aspect_not_empty: "Aspectul nu este gol"
       remove: "şterge"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ ro:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ ro:
   search: "Caută"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Autentificare cu succes."
     destroy: 
       success: "Successfully destroyed authentication."
@@ -711,15 +715,22 @@ ro:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "autentificat pe %{service}"
       manage: "gestionează serviciile la care eşti conectat"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Mesajele publice vor fi disponibile pentru cei ce nu fac parte din Diaspora."
+      share: "Share"
       title: "Sunteţi pe cale de a publica un mesaj public!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "toate"
       all_contacts: "toate contactele"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ ro:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ ro:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ ro:
       edit_account: "Editează cont"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Exportare de date"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "Parolă nouă"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "E-mailul tău"
       your_handle: "Identificatorul tau pe Diaspora"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Editează-ţi profilul"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Terminat!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Bine ai venit pe Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ ro:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 96e2710be..073795fcb 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -64,6 +64,9 @@ ru:
       deselect_all: "Выключить все"
       edit_aspect: "Редактировать аспект «%{name}»"
       select_all: "Включить все"
+    aspect_stream: 
+      stay_updated: "Будьте в курсе"
+      stay_updated_explanation: "Ваш основной поток наполняется вашими контактами, метками, за которыми вы следите и записями нескольких популярных членов сообщества."
     contacts_not_visible: "Контакты в этом аспекте не смогут видеть друг друга."
     contacts_visible: "Контакты в этом аспекте могут видеть друг друга"
     create: 
@@ -89,7 +92,6 @@ ru:
       aspect_not_empty: "Аспект не пуст"
       remove: "удалить"
     index: 
-      community_spotlight: "В центре внимания"
       cubbies: 
         explanation: "Cubbi.es — это первое приложение, разрабатываемое для Диаспоры."
         heading: "Подключение к Cubbi.es"
@@ -111,18 +113,18 @@ ru:
         need_help: "Нужна помощь?"
         satisfaction: "%{link}: осуществляемая сообществом поддержка"
         tutorials_and_wiki: "%{tutorial} и %{wiki}: создающиеся сообществом руководства, инструкции и новости"
+      introduce_yourself: "Это ваш поток. Ныряйте и осваивайтесь."
       keep_us_running: "Помогите %{pod} работать быстро — купите нашим серверам дозу кофе, сделав ежемесячное пожертвование!"
       no_contacts: "Контакты отсутствуют"
       no_tags: "+ Найти метку"
       people_sharing_with_you: "Люди делятся с вами"
       post_a_message: "новая запись >>"
-      see_more_from_us: "Лента рекомендуемых пользователей"
       services: 
         content: "Вы можете подключить к Диаспоре следующие службы:"
         heading: "Подключенные службы"
       unfollow_tag: "Не следить за меткой #%{tag}"
-      welcome: "Добро пожаловать"
-      your_aspects: "Ваши аспекты"
+      welcome_to_diaspora: "Добро пожаловать в Диаспору, %{name}!"
+      your_aspects: "Аспекты"
     many: "%{count} аспект[-а, -ов]"
     move_contact: 
       error: "Ошибка при перемещении контакта: %{inspect}"
@@ -148,7 +150,7 @@ ru:
     selected_contacts: 
       manage_your_aspects: "Управление аспектами."
       no_contacts: "Здесь пока нет ни одного контакта."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Посмотреть всех рекомендуемых"
       view_all_contacts: "Все контакты"
     show: 
       edit_aspect: "редактировать аспект"
@@ -168,7 +170,7 @@ ru:
     heading: "Букмарклет Диаспоры"
     post_something: "Сообщите что-нибудь Диаспоре"
     post_success: "Опубликовано! Закрытие!"
-  cancel: "Отмена"
+  cancel: "Отменить"
   comments: 
     few: "%{count} комментариев"
     many: "%{count} комментариев"
@@ -185,7 +187,7 @@ ru:
     few: "%{count} контакт[-а, -ов]"
     index: 
       add_a_new_aspect: "Новый аспект"
-      add_to_aspect: "Добавить контакты в %{name}"
+      add_to_aspect: "добавить контакты в %{name}"
       all_contacts: "Все контакты"
       check_out: "Оцените"
       many_people_are_you_sure: "Вы уверены, что хотите начать приватную беседу с числом контактов более %{suggested_limit}? Возможно, лучше просто написать сообщение в этот аспект."
@@ -444,7 +446,7 @@ ru:
     email_sent_by_diaspora: "Это письмо было послано Диаспорой. Если вы не хотите получать подобные письма,"
     hello: "Привет, %{name}!"
     liked: 
-      liked: "%{name} понравилось Ваше сообщение"
+      liked: "%{name} понравилось ваше сообщение"
       view_post: "Посмотреть запись >"
     mentioned: 
       mentioned: "упомянул вас в сообщении:"
@@ -452,7 +454,7 @@ ru:
     private_message: 
       reply_to_or_view: "Ответить или посмотреть эту беседу >"
     reshared: 
-      reshared: "%{name} только что поделился(лась) вашей записью"
+      reshared: "%{name} поделился(лась) вашей записью"
       view_post: "Посмотреть запись >"
     single_admin: 
       admin: "Ваш администратор Диаспоры"
@@ -652,6 +654,8 @@ ru:
   search: "Поиск"
   services: 
     create: 
+      already_authorized: "Пользователь с идентификатором %{diaspora_id} уже авторизовал эту учетную запись %{service_name}."
+      failure: "Ошибка авторизации."
       success: "Проверка подлинности прошла успешно."
     destroy: 
       success: "Идентификация успешно удалена."
@@ -711,15 +715,22 @@ ru:
     notification: 
       new: "Новый %{type} из %{from}"
     public_explain: 
+      control_your_audience: "Выбирайте свою аудиторию"
       logged_in: "вошли в %{service}"
       manage: "управление подключенными сервисами"
-      outside: "Публичные сообщения доступны для чтения всем, даже за пределами вашей Диаспоры."
+      new_user_welcome_message: "Используйте #метки для классификации своих записей и поиска людей со схожими интересами. Привлекайте внимание интересных людей с помощью @упоминаний"
+      outside: "Публичные сообщения доступны для чтения всем, даже за пределами Диаспоры."
+      share: "Делитесь"
       title: "Настройка подключенных услуг"
+      visibility_dropdown: "Используйте это выпадающее меню для смены видимости вашей записи (мы предлагаем вам сделать первую запись публичной)."
     publisher: 
       all: "все"
       all_contacts: "все контакты"
       discard_post: "Отменить запись"
       make_public: "сделать публичным"
+      new_user_prefill: 
+        hello: "Привет всем, я тут #%{new_user_tag}."
+        i_like: "Я интересуюсь %{tags}."
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка..."
       publishing_to: "публикация в:"
@@ -730,6 +741,8 @@ ru:
     reshare: 
       reshare: "Поделиться повторно"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Не нравится"
       hide_and_mute: "Скрыть и отключить уведомления"
       like: "Мне нравится"
@@ -758,20 +771,22 @@ ru:
     show_more_comments: "Остальные комментарии (%{number})"
   streams: 
     aspects: 
-      title: "Ваши аспекты"
+      title: "Аспекты"
     aspects_stream: "Аспекты"
     commented_on: "обсуждаемые"
     community_spotlight_stream: "В центре внимания"
     followed_tag: 
-      contacts_title: "Люди, интересующиеся этими метками"
-      title: "#Отслеживаемые метки"
-    followed_tags_stream: "#Отслеживаемые метки"
+      add_a_tag: "Add a tag"
+      contacts_title: "Интересуются этими метками"
+      follow: "Follow"
+      title: "#Метки"
+    followed_tags_stream: "#Метки"
     mentioned_stream: "@Упоминания"
     mentions: 
       contacts_title: "Упоминавшие вас люди"
       title: "@Упоминания"
     multi: 
-      contacts_title: "Люди в вашем Потоке"
+      contacts_title: "В вашем потоке"
       title: "Поток"
     posted: "опубликованные"
     public: 
@@ -831,52 +846,32 @@ ru:
       edit_account: "Редактировать аккаунт"
       email_awaiting_confirmation: "Мы послали ссылку для активации на %{unconfirmed_email}. Пока вы не пройдете по ней и не активируете новый адрес, мы будем использовать ваш прежний ящик %{email}."
       export_data: "Экспорт информации"
+      getting_started: "Новые пользовательские настройки"
       liked: "...кому-нибудь нравится ваше сообщение?"
       mentioned: "... вы упомянуты в сообщении?"
       new_password: "Новый пароль"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "... вы получаете личное сообщение?"
       receive_email_notifications: "Получать уведомление по электронной почте, когда..."
       reshared: "...кто-то делится вашей записью?"
       show_community_spotlight: "Показывать рекомендуемых пользователей в Потоке?"
+      show_getting_started: "Вернуть информацию для начинающих"
       started_sharing: "...кто-то начинает делиться с вами?"
-      stream_preferences: "Настройки Потока"
+      stream_preferences: "Настройки потока"
       your_email: "Ваш адрес электронной почты"
       your_handle: "Ваш идентификатор в Диаспоре"
     getting_started: 
-      bold: "аспектов"
-      community_spotlight: "В центре внимания"
+      awesome_take_me_to_diaspora: "Чудесно! Пустите меня в Диаспору*"
       community_welcome: "Сообщество Диаспоры радо приветствовать вас!"
-      connect_to: "Подключитесь к"
-      connect_to_your_other_social_networks: "Подключитесь к другим вашим социальным сетям"
-      connect_to_your_other_social_networks_explanation_p1: "Подключение к службам позволит вам публиковать записи на этих сервисах."
-      connect_to_your_other_social_networks_explanation_p2: "Подключившись к Facebook, вы также сможете найти друзей, уже зарегистрированных в Диаспоре, и пригласить остальных."
-      connect_with_people: "Знакомьтесь с интересными людьми"
-      connect_with_people_explanation_pt1: "Общайтесь с людьми, добавляя их в один или несколько ваших %{bold}."
-      connect_with_people_explanation_pt2: "Аспекты - это интуитивно понятный способ организации новых и уже знакомых собеседников, видимый только вам и позволяющий легко делиться только с нужными группами людей."
-      edit_profile: "Редактировать профиль"
-      featured_tags: "Следить за рекомендуемыми метками"
-      fill_out_your_profile: "Заполните ваш профиль"
-      find_friends: "Найти друзей"
-      find_friends_from_facebook: "найти друзей из Facebook"
-      finished: "Готово"
-      follow_your_interests: "Следите за интересующими вас темами"
-      get_updates_from_core: "Получайте новости проекта от команды разработчиков."
       hashtag_explanation: "Метки позволяют вам обсуждать и следить за интересующими вас темами. Это также отличный способ поиска единомышленников в Диаспоре."
-      not_mandatory: "Выполнение следующих действий не является обязательным, но расширит ваши возможности в Диаспоре."
-      profile_description: "Помогите другим найти вас, заполнив ваш профиль."
-      profile_fields: 
-        bio: "Биография"
-        birthday: "День рождения"
-        gender: "Пол"
-        location: "Местоположение"
-        name: "Имя"
-        photo: "Фото"
-        tags: "Метки"
-      search_for_hashtags: "Искать по #меткам"
-      search_for_people: "Искать людей"
-      see_all_community_spotlight: "Посмотреть всех рекомендуемых пользователей"
-      welcome: "Добро пожаловать!"
-      welcome_with_name: "Добро пожаловать, %{name}!"
+      hashtag_suggestions: "Попробуйте следующие метки, например #искусство, #кино, #gif и т. п."
+      hooking_up_fb: "подключив вашу учетную запись Facebook"
+      saved: "Сохранено!"
+      we_can_speed_things_up: "Регистрацию можно ускорить"
+      well_hello_there: "Приветствуем вас!"
+      what_are_you_in_to: "Чем вы интересуетесь?"
+      what_facebook_does: "к Диаспоре. Это автоматически заполнит ваше имя и фотографию, а также вы сможете отправлять туда копии своих записей."
+      who_are_you: "Кто вы?"
     logged_out: 
       go_mobile: "Заходите с мобильного!"
       on_your_mobile_device: "на вашем устройстве для доступа к мобильной версии Диаспоры."
@@ -901,3 +896,4 @@ ru:
     no_person_constructed: "Ни одно лицо не может быть собрано из этой hcard."
     not_enabled: "webfinger не будет включен для хоста %{account}'s"
     xrd_fetch_failed: "Произошла ошибка при получении xrd с %{account}"
+  welcome: "Добро пожаловать!"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 61ad54590..27f306921 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -64,6 +64,9 @@ sk:
       deselect_all: "Odznačiť všetky"
       edit_aspect: "Upraviť %{name}"
       select_all: "Označiť všetky"
+    aspect_stream: 
+      stay_updated: "Buďte v obraze"
+      stay_updated_explanation: "Na svojej hlavnej nástenke nájdete všetky svoje kontakty, štítky, ktoré sledujete a príspevky od niektorých tvorivých členov komunity."
     contacts_not_visible: "Kontakty v tejto kategórii sa nebudú môcť navzájom vidieť."
     contacts_visible: "Kontakty v tejto kategórii sa budú môcť navzájom vidieť."
     create: 
@@ -89,7 +92,6 @@ sk:
       aspect_not_empty: "Kategória nie je prázdna"
       remove: "odstrániť"
     index: 
-      community_spotlight: "Aktuality z komunity"
       cubbies: 
         explanation: "Cubbi.es je prvá aplikácia, ktorá sa vyvíja v Diaspore."
         heading: "Pripojiť sa ku Cubbi.es"
@@ -111,17 +113,17 @@ sk:
         need_help: "Potrebujete pomoc?"
         satisfaction: "%{link}: podpora od ostatných používateľov"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: príručky od ostatných používateľov, návody a novinky"
+      introduce_yourself: "Toto je vaša nástenka.  Poďte sa predstaviť."
       keep_us_running: "Na udržanie %{pod} v dobrej kondícii kúpte svojím príspevkom našim serverom ich mesačnú dávku kávy vo forme opráv!"
       no_contacts: "Žiadne kontakty"
       no_tags: "+ Nájdite štítok, ktorý budete sledovať"
       people_sharing_with_you: "Ľudia, s ktorými ste sa s niečim podelili"
       post_a_message: "Poslať správu >>"
-      see_more_from_us: "Zobraziť viac z komunity D*."
       services: 
         content: "S Diasporou môžete prepojiť tieto služby:"
         heading: "Pripojiť sa k službám"
       unfollow_tag: "Prestať sledovať #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Vitaj na Diaspore, %{name}!"
       your_aspects: "Vaše kategórie"
     many: "%{count} kategórií"
     move_contact: 
@@ -132,9 +134,9 @@ sk:
       create: "Vytvoriť"
       name: "Meno (uvidíte ho len vy)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Môžete vyhľadať (hore) alebo pozvať (vpravo) viac ľudí."
+      community_spotlight: "v centre pozornosti komunity"
+      or_spotlight: "Alebo môžete zdieľať s %{link}"
+      try_adding_some_more_contacts: "Môžete vyhľadať alebo pozvať viac ľudí."
       you_should_add_some_more_contacts: "Mali by ste ešte pridať pár kontaktov!"
     no_posts_message: 
       start_talking: "Nikto ešte nič nepovedal!"
@@ -148,7 +150,7 @@ sk:
     selected_contacts: 
       manage_your_aspects: "Spravujte svoje kategórie."
       no_contacts: "Nemáte tu ešte žiadne kontakty."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Zobraziť všetko, čo je v centre pozornosti komunity"
       view_all_contacts: "Zobraziť všetky kontakty"
     show: 
       edit_aspect: "upraviť kategóriu"
@@ -185,7 +187,7 @@ sk:
     few: "kontakty (%{count})"
     index: 
       add_a_new_aspect: "Pridať novú kategóriu"
-      add_to_aspect: "Všetky kontakty do kategórie %{name}"
+      add_to_aspect: "Pridať kontakty do kategórie %{name}"
       all_contacts: "Všetky kontakty"
       check_out: "Vyskúšať"
       many_people_are_you_sure: "Určite chcete začať súkromný rozhovor s viac ako %{suggested_limit} ľuďmi? Poslanie príspevku do tejto kategórie môže byť lepší spôsob, ako sa s nimi spojiť."
@@ -391,12 +393,12 @@ sk:
       two: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
       zero: "%{actors} ľuďom sa páčil váš vymazaný príspevok."
     mentioned: 
-      few: "%{actors} vás spomenul(a) v príspevku %{post_link}."
+      few: "%{actors} vás spomenul(a) v %{post_link}."
       many: "%{actors} vás spomenuli v príspevku %{post_link}."
       one: "%{actors} vás spomenul(a) v príspevku %{post_link}."
-      other: "%{actors} vás spomenul(a) v príspevku %{post_link}."
-      two: "%{actors} vás spomenuli v príspevku %{post_link}."
-      zero: "%{actors} vás spomenulo v príspevku %{post_link}."
+      other: "%{actors} vás spomenul(a) v %{post_link}."
+      two: "%{actors} vás spomenuli v %{post_link}."
+      zero: "%{actors} vás spomenulo v %{post_link}."
     mentioned_deleted: 
       few: "%{actors} vás spomenuli vo vymazanom príspevku."
       many: "%{actors} ľudia vás spomenuli vo vymazanom príspevku."
@@ -604,13 +606,13 @@ sk:
       unhappy: "Nešťastný?"
       update: "Aktualizovať"
     new: 
-      create_my_account: "Založiť si účet"
+      create_my_account: "Založte si účet!"
       enter_email: "Zadajte e-mail"
       enter_password: "Zadajte heslo"
       enter_password_again: "Zadajte rovnaké heslo ako predtým"
       enter_username: "Zadajte používateľské meno (iba písmená, číslice a podčiarkovníky)"
       join_the_movement: "Pripojte sa k hnutiu!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Prepojenie cez sociálne siete s < 3"
   requests: 
     create: 
       sending: "Posiela sa..."
@@ -652,6 +654,8 @@ sk:
   search: "Vyhľadávanie"
   services: 
     create: 
+      already_authorized: "Používateľ s ID na Diasporu %{diaspora_id} už prepojiť svoj účet so sieťou %{service_name}."
+      failure: "Vašu totožnosť sa nepodarilo overiť."
       success: "Autentifikácia prebehla úspešne."
     destroy: 
       success: "Autentifikácia úspešne zrušená."
@@ -711,15 +715,22 @@ sk:
     notification: 
       new: "Nový %{type} od %{from}"
     public_explain: 
+      control_your_audience: "Kontrolovať publikum"
       logged_in: "Prihlásenie na %{service}"
       manage: "Spravovať pripojené služby"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Verejnú správu môžu vidieť aj používatelia mimo Diaspory."
+      share: "Zdieľať"
       title: "Nastaviť pripojené služby"
+      visibility_dropdown: "Použite toto rozbaľovacie menu na zmenu viditeľnosti svojho príspevku. (Navrhujeme, aby ste tento prvý nechali uverejnený.)"
     publisher: 
       all: "všetko"
       all_contacts: "Všetky kontakty"
       discard_post: "Vymazať príspevok"
       make_public: "Zverejniť"
+      new_user_prefill: 
+        hello: "Hej, všetci, Som #%{new_user_tag}. "
+        i_like: "Zaujíma ma %{tags}."
       post_a_message_to: "Poslať správu na %{aspect}"
       posting: "Posiela sa..."
       publishing_to: "Publikuje sa na: "
@@ -730,6 +741,8 @@ sk:
     reshare: 
       reshare: "Znovu sa podeliť"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Nepáči sa mi to"
       hide_and_mute: "Schovať a vypnúť"
       like: "Páči sa mi to"
@@ -758,26 +771,28 @@ sk:
     show_more_comments: "Zobraziť ďalších %{number} komentárov"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Vaše kategórie"
+    aspects_stream: "Kategórie"
+    commented_on: "komentované"
+    community_spotlight_stream: "V centre pozornosti komunity"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Ľudia, ktorí sledujú tieto štítky"
+      follow: "Follow"
+      title: "#Sledované štítky"
+    followed_tags_stream: "#Sledované štítky"
+    mentioned_stream: "@Zmienky"
     mentions: 
       contacts_title: "Ľudia, ktorí vás spomenuli"
-      title: "Vaše zmienky/Zmienky o vás"
+      title: "@Zmienky"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Ľudia na vašej nástenke"
+      title: "Nástenka"
+    posted: "odoslané"
     public: 
       contacts_title: "Autori najnovších príspevkov"
       title: "Verejná aktivita"
-    recently: "recently:"
+    recently: "nedávno:"
     tags: 
       contacts_title: "Ľudia, ktorí hľadajú tieto štítky"
       title: "Príspevky so štítkami: %{tags}"
@@ -831,52 +846,32 @@ sk:
       edit_account: "Upraviť účet"
       email_awaiting_confirmation: "Poslali sme vám odkaz na aktiváciu %{unconfirmed_email}. Kým nekliknete na tento odkaz a neaktivujete si novú adresu, budeme stále používať vašu pôvodnú adresu %{email}."
       export_data: "Exportovať dáta"
+      getting_started: "Nové nastavenia používateľa"
       liked: "...sa niekomu páči váš príspevok?"
       mentioned: "...vás spomenuli v príspevku?"
       new_password: "Nové heslo"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...dostanete súkromnú správu?"
       receive_email_notifications: "Poslať oznam e-mailom, ak"
       reshared: "...sa niekto znova podelí o váš príspevok?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Zobraziť, čo je v centre pozornosti komunity na nástenke?"
+      show_getting_started: "Znova spustiť začiatočné nastavenia"
       started_sharing: "...sa niekto s vami o niečo podelí?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Nastavenia nástenky"
       your_email: "Váš e-mail"
       your_handle: "Vaše id na Diasporu"
     getting_started: 
-      bold: "kategórie"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Super! Prejsť na Diasporu*"
       community_welcome: "Komunita Diaspory je šťastná, že ste na jej palube!"
-      connect_to: "Pripojiť sa na"
-      connect_to_your_other_social_networks: "Pripojte sa na ďalšie sociálne siete"
-      connect_to_your_other_social_networks_explanation_p1: "Pripojenie sa k týmto službám vám umožní na ne publikovať."
-      connect_to_your_other_social_networks_explanation_p2: "S Facebookom budete môcť nájsť priateľov, ktorí sú už na Diaspore a pozvať ostatných."
-      connect_with_people: "Spojte sa so super ľuďmi"
-      connect_with_people_explanation_pt1: "Spojte sa s ľuďmi tak, že sa raz alebo viackrát stanu súčasťou toho, čo sa nazýva %{bold}."
-      connect_with_people_explanation_pt2: "Kategórie sú intuitívny spôsob na zoskupenie nových a známych tvárí, osobných priateľov, umožňujú vám ľahko zoradiť podskupiny svojich kontaktov alebo sa o ne podeliť."
-      edit_profile: "Upraviť profil"
-      featured_tags: "Sledovať navrhované štítky"
-      fill_out_your_profile: "Vypíšte si profil"
-      find_friends: "Nájsť kamarátov"
-      find_friends_from_facebook: "Nájdite priateľov z Facebooku"
-      finished: "Hotovo"
-      follow_your_interests: "Sledujte svoje záujmy"
-      get_updates_from_core: "Získajte novinky o projekte od hlavného tímu."
       hashtag_explanation: "Hashtagy vám umožňujú hovoriť o tom, čo vás zaujíma a sledovať diskusie o takýchto veciach.   Je to aj skvelý spôsob, ako nájsť nových ľudí na Diaspore."
-      not_mandatory: "Ak urobíte tieto kroky, zlepší sa váš používateľský zážitok na Diaspore, ale nie sú povinné."
-      profile_description: "Uľahčite ostatným, aby vás našli tak, že vyplníte údaje do profilu."
-      profile_fields: 
-        bio: "O mne"
-        birthday: "Dátum narodenia"
-        gender: "Pohlavie"
-        location: "Bydlisko"
-        name: "Meno"
-        photo: "Fotka"
-        tags: "Štítky"
-      search_for_hashtags: "Hľadať #hashtagy"
-      search_for_people: "Hľadať ľudí"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Vitajte!"
-      welcome_with_name: "Vitajte, %{name}!"
+      hashtag_suggestions: "Skúste štítky ako napr. #art, #movies, #gif, atď."
+      hooking_up_fb: "prepojíte svoj účet na Facebooku"
+      saved: "Uložené!"
+      we_can_speed_things_up: "Môžeme veci urýchliť, ak"
+      well_hello_there: "Nuž, ahoj!"
+      what_are_you_in_to: "Čo vás baví?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Kto ste?"
     logged_out: 
       go_mobile: "Teraz buďte mobilní."
       on_your_mobile_device: "na mobile, aby ste sa mohli dostať na verziu Diaspory* pre mobily."
@@ -891,8 +886,8 @@ sk:
       language_not_changed: "Nepodarilo sa zmeniť jazyk"
       password_changed: "Heslo sa zmenilo. Teraz sa môžete prihlásiť so svojím novým heslom."
       password_not_changed: "Nepodarilo sa zmeniť heslo"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Nepodarilo sa aktualizovať nastavenia"
+      settings_updated: "Nastavenia aktualizované"
       unconfirmed_email_changed: "E-mailová adresa sa zmenila. Treba ju aktivovať."
       unconfirmed_email_not_changed: "Nepodarilo sa zmeniť e-mailovú adresu"
   webfinger: 
@@ -901,3 +896,4 @@ sk:
     no_person_constructed: "Žiadna osoba nemôže byť vytvorená z tejto hcard."
     not_enabled: "Zdá sa, že webfinger nie je povolený pre hostiteľa účtu %{account}"
     xrd_fetch_failed: "Pri získavaní xrd z účtu %{account} nastala chyba"
+  welcome: "Vitajte!"
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index 38c21821e..b6f7d277e 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -64,6 +64,9 @@ sq:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Contacts in this aspect will not be able to see each other."
     contacts_visible: "Contacts in this aspect will be able to see each other."
     create: 
@@ -89,7 +92,6 @@ sq:
       aspect_not_empty: "Aspect not empty"
       remove: "remove"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ sq:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count} aspects"
     move_contact: 
@@ -652,6 +654,8 @@ sq:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ sq:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "You are about to post a public message!"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "all"
       all_contacts: "all contacts"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ sq:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
       like: "I like this"
@@ -763,7 +776,9 @@ sq:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ sq:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New Password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finished!"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome to Diaspora!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ sq:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 9cb8f0569..118f54341 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -64,6 +64,9 @@ sv:
       deselect_all: "Deselect all"
       edit_aspect: "Ändra %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra."
     contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra."
     create: 
@@ -89,7 +92,6 @@ sv:
       aspect_not_empty: "Aspekten är inte tom"
       remove: "ta bort"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es är den första Diaspora applikationen under utveckling."
         heading: "Anslut till Cubbi.es"
@@ -111,17 +113,17 @@ sv:
         need_help: "Behöver du hjälp?"
         satisfaction: "%{link}: Support ifrån communityn"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Guider, instruktioner och nyheter ifrån communityn"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Håll farten hos %{pod} uppe och köp kaffe till servrarna genom en månadsdonation!"
       no_contacts: "Inga kontakter"
       no_tags: "+ Hitta en tag att följa"
       people_sharing_with_you: "Personer som delar med dig"
       post_a_message: "skriv ett inlägg >>"
-      see_more_from_us: "Se mer av D* communityn."
       services: 
         content: "Du kan koppla ihop Diaspora med följande tjänster:"
         heading: "Ihopkopplade tjänster"
       unfollow_tag: "Sluta följa #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Dina aspekter"
     many: "%{count} aspekter"
     move_contact: 
@@ -304,7 +306,7 @@ sv:
       code: "källkod"
       login: "Logga in"
       logout: "Logga ut"
-      profile: "profil"
+      profile: "Profil"
       recent_notifications: "Tidigare"
       settings: "Inställningar"
       view_all: "Se alla"
@@ -652,6 +654,8 @@ sv:
   search: "Sök"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Autentiering lyckades."
     destroy: 
       success: "Du har nu kopplat bort tjänsten."
@@ -711,15 +715,22 @@ sv:
     notification: 
       new: "Ny %{type} från %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "inloggad på %{service}"
       manage: "hantera anslutna tjänster"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
+      share: "Share"
       title: "Hantera anslutna tjänster"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "alla"
       all_contacts: "alla kontakter"
       discard_post: "Släng inlägg"
       make_public: "gör publik"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
       publishing_to: "publicerar till: "
@@ -730,6 +741,8 @@ sv:
     reshare: 
       reshare: "Återdela"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Jag ogillar det här"
       hide_and_mute: "Dölj och ignorera"
       like: "Jag gillar det här"
@@ -763,7 +776,9 @@ sv:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ sv:
       edit_account: "Ändra konto"
       email_awaiting_confirmation: "Vi har skickat dig en länk till %{unconfirmed_email} för aktivering. Innan du har aktiverat din nya adress, kommer vi fortsätta att använda %{email}."
       export_data: "Exportera data"
+      getting_started: "New User Prefrences"
       liked: "...någon gillar ditt inlägg?"
       mentioned: "...du är omnämnd i en post?"
       new_password: "Nytt lösenord"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka notiser via e-post när..."
       reshared: "...sprider någon mina inlägg vidare?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...någon börjar dela med dig?"
       stream_preferences: "Stream Preferences"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora ID"
     getting_started: 
-      bold: "aspekter"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Vi i Diasporas community är glada att ha dig här!"
-      connect_to: "Anslut till"
-      connect_to_your_other_social_networks: "Anslut till dina andra sociala nätverk"
-      connect_to_your_other_social_networks_explanation_p1: "Ihopkopplingen med andra tjänster gör det möjligt att publicera inlägg i dessa."
-      connect_to_your_other_social_networks_explanation_p2: "Med Facebook har du möjlighet att både hitta vänner som finns på Diaspora och bjuda in nya."
-      connect_with_people: "Anslut till coola personer"
-      connect_with_people_explanation_pt1: "Anslut till personer genom att placera dem i en eller flera av dina %{bold}."
-      connect_with_people_explanation_pt2: "Aspekter är ett innovativt sätt att gruppera nya och välkända ansikten, endast synligt för dig, och gör det möjligt för dig att gruppera och dela endast med utvalda kontakter på ett enkelt sätt."
-      edit_profile: "Redigera profil"
-      featured_tags: "Följ utvalda taggar"
-      fill_out_your_profile: "Fyll i din profil"
-      find_friends: "Hitta vänner"
-      find_friends_from_facebook: "hitta Facebook-vänner"
-      finished: "Slutfört"
-      follow_your_interests: "Följ dina intressen"
-      get_updates_from_core: "Få uppdateringar om projektet ifrån core team."
       hashtag_explanation: "Hashtaggar gör det möjligt att diskutera och följa dina intressen. Det är också ett bra sätt att lära känna nya människor på Diaspora."
-      not_mandatory: "Slutför följande steg för att få ut mer av Diaspora, men det är inte nödvändigt."
-      profile_description: "Gör det lättare för andra att hitta dig genom att fylla i din profil."
-      profile_fields: 
-        bio: "Biografi"
-        birthday: "Födelsedag"
-        gender: "Kön"
-        location: "Plats"
-        name: "Namn"
-        photo: "Foto"
-        tags: "Taggar"
-      search_for_hashtags: "Sök efter #hashtaggar"
-      search_for_people: "Leta efter människor"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Välkommen!"
-      welcome_with_name: "Välkommen, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Använd nu mobilen."
       on_your_mobile_device: "i din mobil för att komma till Diaspora* mobile."
@@ -901,3 +896,4 @@ sv:
     no_person_constructed: "Den här personen kunde inte hittas (hcard-fel)."
     not_enabled: "Webfinger verkar inte vara påslaget på %{account}'s server"
     xrd_fetch_failed: "kunde inte hämta xrd-fil från kontot %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 5f1a4dfe4..82ab03439 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -29,7 +29,7 @@ tr:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Bu iyi, değil mi? Zaten bu gönderiyi tekrar paylaştın!"
         user: 
           attributes: 
             email: 
@@ -37,73 +37,75 @@ tr:
             person: 
               invalid: "geçersiz."
             username: 
-              invalid: "is invalid. We only allow letters, numbers, and underscores"
+              invalid: "geçersiz. Sadece harf,sayı ve alt çizgi"
               taken: "önceden alınmış."
   ago: "%{time} önce"
   all_aspects: "Tüm Yönler"
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALFA"
-      unknown_person: "bilinmiyen kişiler"
+      unknown_person: "bilinmiyen kişi"
       video_title: 
         unknown: "Geçersiz Video Başlığı"
   are_you_sure: "Emin misin?"
   aspect_memberships: 
     destroy: 
-      failure: "Listeden kişi kaldırılamadı"
-      no_membership: "Bu yön ile seçilen kişi bulamadı"
-      success: "Kişi listeden başarıyla kaldırıldı"
+      failure: "Yön'den kişi kaldırılamadı"
+      no_membership: "Bu Yön'de seçilen kişi bulamadı"
+      success: "Kişi Yön'den başarıyla kaldırıldı"
   aspects: 
     add_to_aspect: 
       failure: "Yöne kişi ekleme başarısız."
       success: "Kişi başarıyla yöne eklendi."
     aspect_contacts: 
-      done_editing: "düzenleme başarılı"
+      done_editing: "düzenleme sonlandırıldı"
     aspect_listings: 
       add_an_aspect: "+ Yeni yön ekle"
-      deselect_all: "Deselect all"
+      deselect_all: "Tümünün işaretini kaldır"
       edit_aspect: "Düzenle %{name}"
-      select_all: "Select all"
+      select_all: "Tümünü seç"
+    aspect_stream: 
+      stay_updated: "Güncel Kalın"
+      stay_updated_explanation: "Ana akışınızda takip ettiğiniz kişiler, takip ettiğiniz etiketler ve topluluk üyelerinin gönderileri bulunur."
     contacts_not_visible: "Kişilerin bu yönde birbirlerini görmesi mümkün olmayacaktır."
-    contacts_visible: "Kişilerin bu yönde birbirlerini görmesi mümkün olacak."
+    contacts_visible: "Bu yöndekiler birbirilerini görebilecektir."
     create: 
       failure: "Yön oluşturulamadı."
-      success: "Sol taraftaki artı ya tıklıyarak Diaspora'ya sizin yeni yönünüzü kimlerin görebileceğini belirtin."
+      success: "Yeni yön'ün %{name} yaratıldı"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
-      success: "%{name} başarıyla yaratıldı."
+      failure: "%{name} boş değil, silinemedi."
+      success: "%{name} başarıyla silindi."
     edit: 
-      add_existing: "Mevcut rehbere bir kişi ekle"
+      add_existing: "Mevcut bir bağlantı ekle"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Bu yönü silmek istediğinizden emin misiniz?"
+      confirm_remove_aspect: "Bu yönü silmek istediğinden emin misin?"
       done: "Bitti"
       make_aspect_list_visible: "Yön listesi haline getirilsin mi?"
       remove_aspect: "Yönü sil"
-      rename: "adlandır"
+      rename: "yeniden adlandır"
       update: "güncelle"
       updating: "güncelleniyor"
     few: "%{count} yön"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Yön boş değil"
-      remove: "çıkar"
+      remove: "sil"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
-        explanation: "İlk Diaspora uygulaması Cubbi.es geliştirilme aşamasındadır."
-        heading: "Cubbi.es Bağlan"
+        explanation: "İlk Diaspora uygulaması Cubbi.es, geliştirilme aşamasındadır."
+        heading: "Cubbi.es'e Bağlan"
         learn_more: "Daha fazla bilgi edinin"
       diaspora_id: 
         content_1: "Diaspora ID'niz:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
+        heading: "Diaspora ID (Diaspora Kimliği)"
       donate: "Bağış yap"
       handle_explanation: "Bu Diaspora kimliği. Bir e-posta adresi gibi, bunu insanlara size ulaşması için verebilirsiniz."
       help: 
         do_you: "Do you:"
         email_feedback: "%{link} your feedback, if you prefer"
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
+        feature_and_forum: "%{gs} & %{forum}: Topluluk güçlü destek ve özellik istekleri"
         feature_suggestion: "... bir %{link} önerin var mı?"
         find_a_bug: "... bulabilir misin %{link}?"
         have_a_question: "... bir %{link} var mı?"
@@ -111,33 +113,33 @@ tr:
         need_help: "Yardıma mı ihtiyacın var?"
         satisfaction: "%{link}: Topluluk desteği"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
-      keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      introduce_yourself: "Bu sizin akışınızdır. Atla ve kendini tanıt."
+      keep_us_running: "%{pod} ağının daha hızlı ve hatasız olması için geliştiricilere aylık kahve ısmarlayın!"
       no_contacts: "Kişi yok"
-      no_tags: "+ Bir etiket bul"
-      people_sharing_with_you: "Kişi sizinle paylaşıma başladı"
+      no_tags: "+ Takip etmek için bir etiket bul"
+      people_sharing_with_you: "Seninle paylaşımda bulunanlar"
       post_a_message: "mesaj gönder >>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "Diaspora'ya aşağıdaki hizmetleri bağlayabilirsiniz:"
-        heading: "Servislere Bağlan"
-      unfollow_tag: "Takibi durdur #%{tag}"
-      welcome: "Welcome"
-      your_aspects: "Yönleriniz"
+        heading: "Servisleri ilişkilendir"
+      unfollow_tag: "#%{tag}'i takip etmeyi bırak"
+      welcome_to_diaspora: "Diaspora'ya Hoş Geldin, %{name}!"
+      your_aspects: "Yönlerin"
     many: "%{count} yön"
     move_contact: 
       error: "Kontak taşıma problemi: %{inspect}"
-      failure: "didn't work %{inspect}"
+      failure: "hata oluştu %{inspect}"
       success: "Kişi yeni yöne taşındı"
     new: 
-      create: "Oluştur"
-      name: "Ad"
+      create: "Oluştur:"
+      name: "İsim (sadece siz görebilirsiniz)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
+      community_spotlight: "topluluk gönderileri"
       or_spotlight: "Or you can share with %{link}"
       try_adding_some_more_contacts: "Daha fazla kişiyi bul (üst) ya da davet et (sağ)."
-      you_should_add_some_more_contacts: "Biraz daha fazla kişi eklemek gerekiyor!"
+      you_should_add_some_more_contacts: "Daha fazla kişi eklemelisin!"
     no_posts_message: 
-      start_talking: "Kimse henüz birşey söylemedi. Sohbeti başlatın!"
+      start_talking: "Hiçbir şey söylemedi!"
     one: "1 yön"
     other: "%{count} yön"
     seed: 
@@ -146,13 +148,13 @@ tr:
       friends: "Arkadaşlar"
       work: "İş"
     selected_contacts: 
-      manage_your_aspects: "Yönleri yönetir."
+      manage_your_aspects: "Yönleri düzenle."
       no_contacts: "You don't have any contacts here yet."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Tüm topluluk spotlight bakın"
       view_all_contacts: "Tüm kişileri görüntüle"
     show: 
       edit_aspect: "yön düzenle"
-    two: "%{count} yön"
+    two: "%{count} yönleri"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
       success: "Yönünüz, %{name}, başarıyla düzeltildi."
@@ -163,10 +165,10 @@ tr:
       revoke_access: "Erişimi Kaldır"
   back: "Geri"
   bookmarklet: 
-    explanation: "%{link} from anywhere by bookmarking this link."
-    explanation_link_text: "Post to Diaspora"
-    heading: "Diaspora Yer İşareti"
-    post_something: "Post something to Diaspora"
+    explanation: "%{link} yer imleri çubuğuna sürükleyin."
+    explanation_link_text: "Diaspoara Gönder"
+    heading: "Diaspora yer işareti"
+    post_something: "Diaspora için birşey gönder"
     post_success: "Gönderildi! Kapatılıyor!"
   cancel: "İptal Et"
   comments: 
@@ -202,7 +204,7 @@ tr:
     sharing: 
       people_sharing: "Sizinle paylaşıyor:"
     spotlight: 
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Topluluk Gönderileri"
     two: "%{count} kişi"
     zero: "kişi yok"
   conversations: 
@@ -248,43 +250,43 @@ tr:
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Alttaki yanlıșları düzeltin ve tekrar deneyin."
-      invalid_fields: "Yanlıș Alanlar"
+      invalid_fields: "Geçersiz Alanlar"
   fill_me_out: "Beni doldur"
-  find_people: "Kişi bul"
+  find_people: "Kişi ve #tag bul"
   hide: "Gizle"
   home: 
     show: 
-      already_account: "Zaten bir hesabınız var mı?"
+      already_account: "Zaten bir hesabın var mı?"
       choice: "Seçim"
       choice_explanation: "Diaspora bağlantılarınızı yön adı verilen gruplar halinde sıralamanızı sağlar. Diaspora'ya özgü olarak, yönleri, fotoğrafları, hikayeleri ve şakaları sadece istediğiniz insanlarla paylaşırsınız."
-      learn_about_host: "Sunucunuzda Diaspora'ya sahip olmak hakkında bilgi edinin"
+      learn_about_host: "Sunucunuzda Diaspora'yı sunmak için bilgi edin."
       login_here: "buradan oturum açın"
       ownership: "Sahiplik"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
-      share_what_you_want: "İstediğinizle,istediğinizi paylaşın."
+      ownership_explanation: "Kendi resimlerinin sahıbı sensin, paylaşabilmek için bu hakkından olmaman lazım. Diaspora'da paylaştığın herşeyin sahibi sen olmaya devam edersin ve yayılmasında tüm kontrol sendedir."
+      share_what_you_want: "İstediğinle, istediğini paylaş."
       simplicity: "Sadelik"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
+      simplicity_explanation: "Diaspora, sadeliğe,kolay paylaşıma ve gizliliklere önem verir. Doğal olarak özeldir, Diaspora Java ayarları sayfalarıyla saklama yapmaz.Bu yüzden güvenlidir."
       tagline_first_half: "İstediğiniz ne ise paylaşın,"
-      tagline_second_half: "with whom you want."
+      tagline_second_half: "istediğiniz."
   invitations: 
-    a_facebook_user: "Bir Facebook kullanıcısıysanız"
+    a_facebook_user: "Bir Facebook kullanıcısı"
     check_token: 
       not_found: "Davetiye bulunamadı."
     create: 
-      already_contacts: "Zaten bu kişi ile bağlı."
-      already_sent: "Zaten bu kişi davet edilmiş."
-      no_more: "Başka davetiyeniz bulunmamaktadır."
+      already_contacts: "Bu kişiyle zaten bağlantı kurdun"
+      already_sent: "Bu kişiyi zaten davet ettin."
+      no_more: "Başka davetiyeniz yok."
       own_address: "Kendi adresinize davetiye gönderemezsiniz."
-      rejected: "Aşağıdaki e-posta adreslerinde sorunlar var:"
-      sent: "Your invitation has been sent."
+      rejected: "Bu e-posta adreslerinde sorun oluştu:"
+      sent: "Davetiyeler gönderildi:"
     edit: 
       accept_your_invitation: "Daveti kabul et"
-      your_account_awaits: "Hesabınız bekliyor!"
+      your_account_awaits: "Hesabın bekliyor!"
     new: 
-      already_invited: "Already invited"
-      aspect: "Görünüm"
+      already_invited: "Aşağıdaki kişiler davetinizi kabul etmedi:"
+      aspect: "Yön"
       comma_seperated_plz: "Virgülle ayırarak birden fazla e-posta adresi girebilirsin."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      if_they_accept_info: "kabul ederlerse, 'aspect' ine eklenecekler ???"
       invite_someone_to_join: "Diaspora'ya birilerini davet et!"
       personal_message: "Kişisel mesaj"
       resend: "Tekrar gönder"
@@ -294,8 +296,8 @@ tr:
   layouts: 
     application: 
       powered_by: "GELİŞTİRİCİ DIASPORA*"
-      public_feed: "Genel Diaspora Beslemesi %{name}"
-      toggle: "mobil site'ye git"
+      public_feed: " %{name} için Genel Diaspora Beslemesi"
+      toggle: "mobil site"
       whats_new: "neler yeni?"
       your_aspects: "sizin yönleriniz"
     header: 
@@ -303,10 +305,10 @@ tr:
       blog: "blog"
       code: "kod"
       login: "giriş yap"
-      logout: "çıkış yap"
-      profile: "profil"
+      logout: "Çıkış yap"
+      profile: "Profil"
       recent_notifications: "Son bildirimler"
-      settings: "ayarlar"
+      settings: "Ayarlar"
       view_all: "Tümünü göster"
   likes: 
     likes: 
@@ -316,7 +318,7 @@ tr:
         one: "1 kişi beğenmedi"
         other: "%{count} kişi beğenmedi"
         two: "%{count} beğenmeme"
-        zero: "hiç kimse beğenmedi"
+        zero: "beğenmeyen yok"
       people_like_this: 
         few: "%{count} kişi beğendi"
         many: "%{count} kişi beğendi"
@@ -325,24 +327,24 @@ tr:
         two: "%{count} kişi beğendi"
         zero: "beğenme yok"
       people_like_this_comment: 
-        few: "%{count} beğendi"
-        many: "%{count} beğendi"
-        one: "%{count} beğeni"
-        other: "%{count} beğeni"
-        two: "%{count} kişi beğendi"
-        zero: "beğenme yok"
+        few: "%{count} kişi bunu beğendi"
+        many: "%{count} kişi bunu beğendi!"
+        one: "%{count} beğenme"
+        other: "%{count} beğenme"
+        two: "%{count} kişi bunu beğendi"
+        zero: "beğenen yok"
   limited: "Sınırlı"
   more: "Daha fazla"
   next: "sonraki"
   no_results: "Sonuç Bulunamadı"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      two: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
+      many: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
+      one: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
+      other: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
+      two: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
+      zero: "%{actors} %{post_author} kişisinin %{post_link}sini yorumladı."
     also_commented_deleted: 
       few: "%{actors} silinmiş gönderinize yorum yazdı."
       many: "%{actors} silinmiş gönderinize yorum yazdı."
@@ -351,12 +353,12 @@ tr:
       two: "%{actors} silinmiş gönderinize yorum yazdı."
       zero: "%{actors} silinmiş gönderinize yorum yazdı."
     comment_on_post: 
-      few: "%{actors} yorumladı %{post_link}."
-      many: "%{actors} yorumladı %{post_link}."
-      one: "%{actors} yorumladı %{post_link}."
-      other: "%{actors} yorumladı %{post_link}."
-      two: "%{actors} yorumladı %{post_link}."
-      zero: "%{actors} yorumladı %{post_link}."
+      few: "%{actors} %{post_link}yi yorumladı."
+      many: "%{actors} %{post_link}yi yorumladı."
+      one: "%{actors} %{post_link}yi yorumladı."
+      other: "%{actors} %{post_link}yi yorumladı."
+      two: "%{actors} %{post_link}yi yorumladı."
+      zero: "%{actors} %{post_link}yi yorumladı."
     helper: 
       new_notifications: 
         few: "%{count} yeni bildirim"
@@ -377,12 +379,12 @@ tr:
       mark_all_as_read: "Tümünü Okundu Olarak İşaretle"
       notifications: "Bildirimler"
     liked: 
-      few: "%{actors} %{post_link} gönderini beğendi."
-      many: "%{actors} %{post_link} gönderini beğendi."
-      one: "%{actors} %{post_link} gönderini beğendi."
+      few: "%{actors} %{post_link} beğendi."
+      many: "%{actors} %{post_link} beğendi."
+      one: "%{actors} %{post_link} beğendi."
       other: "%{actors} %{post_link} gönderini beğendi."
-      two: "%{actors} beğendi %{post_link}."
-      zero: "%{actors} senin gönderini beğendi %{post_link}."
+      two: "%{actors} %{post_link}yi beğendi."
+      zero: "%{actors} %{post_link} beğendi."
     liked_post_deleted: 
       few: "%{actors} silinmiş gönderinizi beğendi."
       many: "%{actors} silinmiş gönderinizi beğendi."
@@ -391,12 +393,12 @@ tr:
       two: "%{actors} silinen gönderiyi beğendi."
       zero: "%{actors} silinmiş gönderinizi beğendi."
     mentioned: 
-      few: "%{actors} kişisi %{post_link} gönderisinde senden bahsetti."
-      many: "%{actors} kişisi %{post_link} gönderisinde senden bahsetti."
+      few: "%{actors} %{post_link} senden bahsetti."
+      many: "%{actors} %{post_link} senden bahsetti."
       one: "%{actors} kişisi %{post_link} gönderisinde senden bahsetti."
-      other: "%{actors} kişisi %{post_link} gönderisinde senden bahsetti."
+      other: "%{actors} %{post_link}senden bahsetti."
       two: "%{actors} senden bahsetti %{post_link}."
-      zero: "%{actors} kişisi %{post_link} gönderisinde senden bahsetti."
+      zero: "%{actors} %{post_link} senden bahsetti."
     mentioned_deleted: 
       few: "%{actors} silinmiş gönderide senden bahsetti."
       many: "%{actors} silinmiş gönderide senden bahsetti."
@@ -413,12 +415,12 @@ tr:
       two: "%{actors} size bir mesaj gönderdi."
       zero: "%{actors} mesaj gönderdi."
     reshared: 
-      few: "%{actors} %{post_link} gönderisini tekrar paylaştı."
-      many: "%{actors} %{post_link} gönderisini tekrar paylaştı."
+      few: "%{actors} %{post_link}yi tekrar paylaştı."
+      many: "%{actors} %{post_link}yi tekrar paylaştı."
       one: "%{actors} tekrar paylaştı %{post_link}."
-      other: "%{actors} %{post_link} gönderisini tekrar paylaştı."
-      two: "%{actors} tekrar paylaştı %{post_link}."
-      zero: "%{actors} %{post_link} gönderisini tekrar paylaştı."
+      other: "%{actors} %{post_link}yi tekrar paylaştı."
+      two: "%{actors} %{post_link}yi tekrar paylaştı."
+      zero: "%{actors} %{post_link}yi tekrar paylaştı."
     reshared_post_deleted: 
       few: "%{actors} silenen gönderiyi tekrar paylaştı."
       many: "%{actors} silinen gönderiyi tekrar paylaştı."
@@ -434,8 +436,8 @@ tr:
       two: "%{actors} sizinle paylaşıma başladı."
       zero: "%{actors} sizinle paylaşıma başladı."
   notifier: 
-    a_post_you_shared: "gönderi."
-    click_here: "buraya tıklayın"
+    a_post_you_shared: "gönderi"
+    click_here: "buraya"
     comment_on_post: 
       reply: "Yanıtla ya da %{name} gönderisini görüntüle >"
     confirm_email: 
@@ -444,7 +446,7 @@ tr:
     email_sent_by_diaspora: "Bu e-posta Diaspora tarafından gönderildi. Bu gibi e-postalar almak istemiyorsanız,"
     hello: "Merhaba %{name}!"
     liked: 
-      liked: "%{name} gönderinizi beğendi:"
+      liked: "%{name} gönderinizi beğendi."
       view_post: "Gönderiyi görüntüle >"
     mentioned: 
       mentioned: "gönderisinde senden bahsetti:"
@@ -462,7 +464,7 @@ tr:
       subject: "%{name} has started sharing with you on Diaspora*"
       view_profile: "%{name} kişisinin profilini görüntüle"
     thanks: "Teşekkürler,"
-    to_change_your_notification_settings: "bildirim ayarlarınızı değiştirmek için"
+    to_change_your_notification_settings: "tıklayarak bildirim ayarlarınızı değiştirebilirsiniz"
   ok: "Tamam"
   or: "ya da"
   password: "Parola"
@@ -474,12 +476,12 @@ tr:
       edit_membership: "yön üyelik düzenle"
     few: "%{count} kişi"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
+      people_on_pod_are_aware_of: "Pod'dakiler bunlardan haberdar:"
       results_for: "sonuçları %{params}"
     index: 
-      couldnt_find_them_send_invite: "Onları bulmak istemez misin? O zaman bir davet gönderin!"
+      couldnt_find_them_send_invite: "Onları bulamadın mı? O zaman bir davetiye gönderin!"
       no_one_found: "...ve hiç kimse bulunamadı."
-      no_results: "Hey! Bir şey aramak gerekir."
+      no_results: "Hey! Bir şeyi araman lazım."
       results_for: "arama sonuçları"
     many: "%{count} kişi"
     one: "1 kişi"
@@ -492,17 +494,17 @@ tr:
     profile_sidebar: 
       bio: "hakkında"
       born: "doğum günü"
-      edit_my_profile: "Profil düzenle"
+      edit_my_profile: "Profilimi düzenle"
       gender: "cinsiyet"
       in_aspects: "yönleriyle"
       location: "yer"
       remove_contact: "kişiyi kaldır"
-      remove_from: "%{name} kişisi %{aspect} yönünden kaldırılsın mı?"
+      remove_from: "%{name}, %{aspect} yönünden kaldırılsın mı?"
     show: 
       does_not_exist: "Kişi yok!"
-      has_not_shared_with_you_yet: "%{name} henüz bir şey paylaşmamış!"
+      has_not_shared_with_you_yet: "%{name} seninle henüz bir şey paylaşmamış!"
       incoming_request: "You have an incoming request from this person."
-      mention: "Bahset"
+      mention: "Bunlardan bahset"
       message: "Mesaj"
       not_connected: "You are not connected with this person"
       recent_posts: "Son Gönderiler"
@@ -510,32 +512,32 @@ tr:
       return_to_aspects: "Yönler sayfasına geri dön"
       see_all: "Hepsini gör"
       start_sharing: "paylaşıma başla"
-      to_accept_or_ignore: "kabul et veya yoksay."
+      to_accept_or_ignore: "kabul etmek veya yoksaymak için."
     sub_header: 
       add_some: "biraz ekle"
       edit: "düzenle"
       you_have_no_tags: "etiket yok!"
     two: "%{count} kişi"
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "Üzgünüz, %{handle} bulunamadı."
     zero: "kişi yok"
   photos: 
     comment_email_subject: "%{name}'ın fotoğrafı"
     create: 
-      integrity_error: "Fotoğraf yükleme başarısız oldu. Gerçek bir fotoğraf yüklediğine emin misin?"
-      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-      type_error: "Fotoğraf yüklemesi başarısız oldu.  Bir görüntünün eklendiğinden eminmisiniz?"
+      integrity_error: "Fotoğraf yükleme başarısız oldu. Gerçekten bir fotoğraf mıydı?"
+      runtime_error: "Fotoğraf yüklenmesinde hata oluştu. Emniyet kemerin takılı olduğudan emin misin?"
+      type_error: "Fotoğraf yüklemesi başarısız oldu. Bir görüntünün eklendiğinden emin misin?"
     destroy: 
       notice: "Fotoğraf silindi."
     edit: 
       editing: "Düzeltiliyor"
     new: 
-      back_to_list: "Listeye Geri Git"
+      back_to_list: "Listeye geri dön"
       new_photo: "Yeni Fotoğraf"
-      post_it: "ekle!"
+      post_it: "gönder!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
-      invalid_ext: "{file} geçersiz uzantıya sahip. {extensions} uzantılarına izin verilir."
+      empty: "{file} boş bir dosya, bu olmadan dosyaları tekrar seçin."
+      invalid_ext: "{file} geçersiz uzantıya sahip. sadece {extensions} uzantılarına izin verilir."
       size_error: "{file} çok büyük, en büyük dosya boyutu {sizeLimit}."
     new_profile_photo: 
       or_select_one: "ya da varolanlardan birini seç"
@@ -543,20 +545,20 @@ tr:
     photo: 
       view_all: "%{name}'in bütün fotoğraflarını göster"
     show: 
-      collection_permalink: "bağlantı koleksiyonu"
+      collection_permalink: "sabit bağlantı koleksiyonu"
       delete_photo: "Fotoğrafı Sil"
       edit: "düzenle"
-      edit_delete_photo: "Fotoğrafın tanımını düzenle/ fotoğrafı sil"
+      edit_delete_photo: "Fotoğrafın açıklamasını düzenle / sil"
       make_profile_photo: "profil fotoğrafı yap"
-      show_original_post: "Gerçek gönderi göster"
+      show_original_post: "Orjinal gönderiyi göster"
       update_photo: "Fotoğrafı Güncelle"
     update: 
       error: "Fotoğraf düzeltme başarısız oldu."
-      notice: "Fotoğraf başarıyla eklendi."
+      notice: "Fotoğraf başarıyla güncellendi."
   post_visibilites: 
     update: 
       post_hidden_and_muted: "%{name} kişisinin gönderileri gizlendi, bildirim alımı durduruldu."
-      see_it_on_their_profile: "Bu gönderiye yapılan güncellemeleri görmek istiyorsan,%{name} kişisinin profilini ziyaret etmelisin."
+      see_it_on_their_profile: "Bu gönderiye yapılan güncellemeleri görmek istiyorsan, %{name} kişisinin profilini ziyaret et."
   posts: 
     show: 
       destroy: "Sil"
@@ -566,32 +568,32 @@ tr:
   profile: "Profil"
   profiles: 
     edit: 
-      allow_search: "Diaspora aramaları içinde bulunmaya izin ver"
+      allow_search: "Diaspora aramaları ile bulunmana izin ver"
       edit_profile: "Profil düzenle"
       first_name: "Ad"
-      last_name: "Soyadı"
+      last_name: "Soyad"
       update_profile: "Profili Güncelle"
-      your_bio: "Hakkında"
-      your_birthday: "Doğum günü"
-      your_gender: "Cinsiyet"
-      your_location: "Bulunduğunuz yer"
-      your_name: "Ad"
-      your_photo: "Fotoğraf"
+      your_bio: "Tanıtımın"
+      your_birthday: "Doğum günün"
+      your_gender: "Cinsiyetin"
+      your_location: "Bulunduğun yer"
+      your_name: "Adın"
+      your_photo: "Fotoğrafın"
       your_private_profile: "Özel profilin"
       your_public_profile: "Genel profilin"
-      your_tags: "Seni tanıtan 5 etiket"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_tags: "Kendini 5 kelimede anlat"
+      your_tags_placeholder: "#diaspora #ironing #kittens #music gibi"
     update: 
-      failed: "Profil güncelleme başarısız"
+      failed: "Profil güncellemesi başarısız"
       updated: "Profil güncellendi"
   public: "Genel"
   reactions: 
-    few: "%{count} reactions"
-    many: "%{count} reactions"
-    one: "1 reaction"
-    other: "%{count} reactions"
-    two: "%{count} reactions"
-    zero: "0 reactions"
+    few: "%{count} tepki"
+    many: "%{count} tepki"
+    one: "1 tepki"
+    other: "%{count} tepki"
+    two: "%{count} tepki"
+    zero: "0 tepki"
   registrations: 
     closed: "Üyelik bu Diaspora'da kapandı."
     create: 
@@ -604,13 +606,13 @@ tr:
       unhappy: "Mutsuz?"
       update: "Güncelle"
     new: 
-      create_my_account: "Hesabımı oluştur"
+      create_my_account: "Hesabımı oluştur!"
       enter_email: "Bir e-posta girin"
       enter_password: "Bir parola girin"
       enter_password_again: "Daha önce olduğu gibi aynı parolayı girin."
       enter_username: "Bir kullanıcı adı seçin (sadece harfler, rakamlar ve alt çizgi)"
       join_the_movement: "Harekete katılın!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Sosyal Ağ <3"
   requests: 
     create: 
       sending: "Gönderiliyor..."
@@ -618,7 +620,7 @@ tr:
     destroy: 
       error: "Lütfen bir yön seçiniz!"
       ignore: "Arkadaş isteğini reddettiniz."
-      success: "Siz şimdi arkadaşsınız."
+      success: "Artık paylaşıyorsunuz."
     helper: 
       new_requests: 
         few: "%{count} yeni istek!"
@@ -633,45 +635,47 @@ tr:
     new_request_to_person: 
       sent: "yollandı!"
   reshares: 
-    comment_email_subject: "%{resharer} , %{author} kişisinin gönderisini tekrar paylaştı"
+    comment_email_subject: "%{resharer}, %{author} kişisinin gönderisini tekrar paylaştı"
     create: 
       failure: "Bu gönderi tekrar paylaşılırken hata oluştu."
     reshare: 
-      deleted: "Gerçek gönderi yazarı tarafından silindi."
+      deleted: "Gönderi yazarı tarafından silindi."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
+        few: "%{count} tekrar paylaşım"
+        many: "%{count} tekrar paylaşım"
+        one: "1 tekrar paylaşım"
+        other: "%{count} tekrar paylaşım"
         two: "%{count} tekrar paylaşım"
         zero: "Tekrar paylaş"
       reshare_confirmation: "Tekrar paylaş %{author} - %{text}?"
       reshare_original: "Orijinali tekrar paylaş"
-      reshared_via: "reshared via"
+      reshared_via: "tekrar paylaşıldı, bununla:"
       show_original: "Orjinali görüntüle"
   search: "Ara"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Kimlik doğrulama başarısız oldu."
       success: "Doğrulama başarılı."
     destroy: 
       success: "Doğrulama başarılı bir şekilde kaldırıldı."
     failure: 
-      error: "there was an error connecting that service"
+      error: "hizmete bağlanırken hata oluştu"
     finder: 
       no_friends: "Hiç Facebook arkadaşı bulunamadı."
       service_friends: "%{service} Arkadaşları"
     index: 
-      connect_to_facebook: "Facebook'u Bağla"
-      connect_to_tumblr: "Tumblr'ı Bağla"
-      connect_to_twitter: "Twitter'ı Bağla"
-      disconnect: "çık"
+      connect_to_facebook: "Facebook'a bağlan"
+      connect_to_tumblr: "Tumblr'e bağlan"
+      connect_to_twitter: "Twitter'e bağlan"
+      disconnect: "bağlantıyı kes"
       edit_services: "Servisleri düzenle"
       logged_in_as: "olarak bağlandınız"
-      no_services: "Bağlanmış servis bulunmuyor."
-      really_disconnect: "bağlantı kesilsin mi %{service}?"
+      no_services: "Henüz bir servis ile bağlantı kurmadın."
+      really_disconnect: "%{service} ile bağlantı kesilsin mi?"
     inviter: 
       click_link_to_accept_invitation: "Daveti kabul etmek bu bağlantıya tıklayın"
-      join_me_on_diaspora: "DIASPORA* Katılın"
+      join_me_on_diaspora: "DIASPORA*'da bana katılın"
     remote_friend: 
       invite: "davet et"
       not_on_diaspora: "Henüz Diaspora'da değil"
@@ -680,62 +684,71 @@ tr:
   shared: 
     add_contact: 
       add_new_contact: "Yeni kişi ekle"
-      create_request: "Diaspora ID bul"
+      create_request: "Diaspora ID ile bul"
       diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Diaspora kullanıcı adınızı giriniz:"
       know_email: "E-posta adresini biliyor musun? O zaman onu davet et"
-      your_diaspora_username_is: "Diaspora kullanıcı adınız: %{diaspora_handle}"
+      your_diaspora_username_is: "Diaspora kullanıcı adın: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "Yönüne ekle"
       toggle: 
-        few: "%{count} yön"
-        many: "%{count} yön"
-        one: "%{count} yön"
-        other: "%{count} yön"
-        two: "%{count} yön"
+        few: "%{count} yönde"
+        many: "%{count} yönde"
+        one: "%{count} yönde"
+        other: "%{count} yönde"
+        two: "%{count} yönde"
         zero: "Yönüne ekle"
     contact_list: 
       all_contacts: "Bütün kişiler"
     footer: 
-      logged_in_as: "giriş yaptı %{name}"
+      logged_in_as: "%{name} adıyla giriş yapıldı"
       your_aspects: "yönleriniz"
     invitations: 
-      by_email: "E-posta"
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      from_facebook: "Facebook"
-      invitations_left: "(%{count} davet kaldı)"
-      invite_someone: "Birisini davet edin"
+      by_email: "E-posta ile"
+      dont_have_now: "Şu an davetiyen yok, ama yakında gelir!"
+      from_facebook: "Facebook'dan"
+      invitations_left: "%{count} kaldı"
+      invite_someone: "Birisini davet et"
       invite_your_friends: "Arkadaşlarını davet et"
-      invites: "Davetler"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites: "Davetiyeler"
+      invites_closed: "Bu Diaspora'da davet kapalı görünüyor"
     notification: 
       new: "%{from}'den yeni %{type}"
     public_explain: 
-      logged_in: "%{service} , bağlandınız."
+      control_your_audience: "Hedef Kitle Kontrolü"
+      logged_in: "%{service} servisine bağlandınız."
       manage: "bağlı servisleri yönetin"
-      outside: "Genel mesajlar Diaspora'nın dışındakiler içinde görünür olucak."
-      title: "Herkese görünür bir mesaj göndermek üzeresiniz!"
+      new_user_welcome_message: "#hashtag ile gönderilerinizi sınıflandırabilir veya ilgi alanlarını paylaşan kişileri bulabilirsiniz. @Bahset kişiler ile iletişim kurmak için harika bir yoldur."
+      outside: "Genel mesajlar, Diaspora dışından da görünür."
+      share: "Paylaş"
+      title: "Bağlı hizmetler"
+      visibility_dropdown: "Açılan menüden gönderinizin görünürlüğünü değiştirebilirsiniz. (İlk olarak Genel yapmanızı öneririz.)"
     publisher: 
       all: "hepsi"
-      all_contacts: "bütün kişiler"
-      discard_post: "Gönderi atın"
+      all_contacts: "tüm bağlantılar"
+      discard_post: "Gönderiyi sil"
       make_public: "herkese görünür yap"
-      post_a_message_to: "Mesaj gönder %{aspect}"
+      new_user_prefill: 
+        hello: "Hey herkes, Ben #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
+      post_a_message_to: "%{aspect} yönüne mesaj gönder "
       posting: "Gönderiliyor..."
-      publishing_to: "yayınlayan:"
+      publishing_to: "buraya yayınlanıyor:"
       share: "Paylaş"
-      share_with: "Share with %{aspect}"
+      share_with: "paylaş"
       upload_photos: "Fotoğraf yükle"
       whats_on_your_mind: "Ne düşünüyorsun?"
     reshare: 
-      reshare: "Yeniden Paylaş"
+      reshare: "Yeniden paylaş"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "yorum kullanılamıyor"
       dislike: "Beğenme"
-      hide_and_mute: "Gizle ve Sessiz"
+      hide_and_mute: "Gizle"
       like: "Beğen"
-      shared_with: "Paylaşılan: %{aspect_names}"
+      shared_with: "%{aspect_names} ile paylaşıldı"
       unlike: "Beğenme"
-      via: "tarafından %{link}"
+      via: "%{link} ile"
       viewable_to_anyone: "Bu gönderi web üzerindeki herkes tarafından görünebilir."
   status_messages: 
     create: 
@@ -747,60 +760,62 @@ tr:
     new: 
       mentioning: "Bahseden: %{person}"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
+      few: "durum mesajları %{count} karakterden az olmalıdır."
+      many: "durum mesajları %{count} karakterden az olmalıdır."
+      one: "durum mesajları %{count} karakterden az olmalıdır."
+      other: "durum mesajları %{count} karakterden az olmalıdır."
       two: "lütfen durum güncellerken %{count} karakterden az kullanın"
-      zero: "please make your status messages less than %{count} characters"
+      zero: "durum mesajları %{count} karakterden az olmalıdır."
   stream_helper: 
-    hide_comments: "yorumları gizle"
+    hide_comments: "Yorumları gizle"
     show_more_comments: "%{number} daha fazla yorum göster"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Yönleriniz"
+    aspects_stream: "Yönler"
+    commented_on: "yorumladı"
+    community_spotlight_stream: "Topluluk Spotlight"
     followed_tag: 
+      add_a_tag: "Etiket ekle"
       contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      follow: "Takip Et"
+      title: "#Takip Edilen Etiketler"
+    followed_tags_stream: "#Takip Edilen Etiketler"
+    mentioned_stream: "@Bahsedenler"
     mentions: 
-      contacts_title: "People who mentioned you"
-      title: "Senden Bahsedenler"
+      contacts_title: "Kişi senden bahsetti"
+      title: "@Bahsedenler"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Kişi akışı"
+      title: "Akış"
+    posted: "gönderildi"
     public: 
-      contacts_title: "Recent Posters"
-      title: "Public Activity"
-    recently: "recently:"
+      contacts_title: "Yeni Düzen"
+      title: "Genel Aktiviteler"
+    recently: "son zamanlarda:"
     tags: 
-      contacts_title: "People who dig these tags"
+      contacts_title: "Kişileri etiketle"
       title: "Gönderi etiketlendi: %{tags}"
   tag_followings: 
     create: 
-      failure: "Takip etmek başarısız: #%{name}"
+      failure: "Takip etmek başarısız: #%{name}. Zaten onu takip eden var mı?"
       success: "Başarıyla takip ediliyor: #%{name}"
     destroy: 
       failure: "Takibi durdurmak başarısız oldu: #%{name}"
       success: "Takip başarıyla durduruldu: #%{name}"
   tags: 
     show: 
-      follow: "Takip Et #%{tag}"
-      followed_by: "followed by"
-      following: "Takip Ediliyor #%{tag}"
-      nobody_talking: "Nobody is talking about %{tag} yet."
+      follow: "Takip et: #%{tag}"
+      followed_by: "takip edenler:"
+      following: "#%{tag} takip ediliyor"
+      nobody_talking: "%{tag} hakkında konuşan yok henüz."
       people_tagged_with: "Kişi etiketlendi %{tag}"
-      posts_tagged_with: "Gönderi etiketlendi #%{tag}"
+      posts_tagged_with: "#%{tag} ile etiketlenmiş gönderiler"
       stop_following: "Takibi Durdur #%{tag}"
   tokens: 
     show: 
       connect_to_cubbies: "Cubbi.es Bağlan"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
+      connecting_is_simple: "Diaspora'da hesap bağlama basittir! Sadece Diaspora ID'nizi girin (<b>%{diaspora_id}</b>) ve Cubbi.es <a href='%{href_link}'>ayarlar</a> sayfasına gidin."
       daniels_account: "Daniel'in Diaspora hesabı"
       log_in_with_diaspora_is_comming: "Çok yakında,yeni bir hesap oluşturmadan diğer Diaspora uygualamlarına bağlanabileceksiniz."
       love_to_try: "Bunu denemek isterdim."
@@ -809,14 +824,14 @@ tr:
       sign_up_today: "Bugün kaydolun!"
       typical_userpage: "Tipik bir cubbi.es kullanıcı sayfası"
       via: "(%{link} aracılığıyla)"
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+      what_is_cubbies: "Cubbi.es ilk Diaspoara uygulamasıdır. Ayrıca fotoğrafları toplamanın  en iyi çevirimiçi yoludur."
   undo: "Geri Al?"
   username: "Kullanıcı Adı"
   users: 
     confirm_email: 
       email_confirmed: "E-posta %{email} doğrulandı"
-      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
-    destroy: "Hesap başarıyla kapatıldı"
+      email_not_confirmed: "E-posta doğrulanamadı. Yanlış bağlantı olabilir mi?"
+    destroy: "Hesap başarıyla kapatıldı."
     edit: 
       also_commented: "...birisi gönderime yorum yazdığında?"
       change: "Değiştir"
@@ -824,65 +839,45 @@ tr:
       change_language: "Dili değiştir"
       change_password: "Parolamı değiştir"
       close_account: "Hesabımı Kapat"
-      comment_on_post: "...yorum yazdığında?"
+      comment_on_post: "...birisi gönderine yorum yazdığında?"
       current_password: "Mevcut parola"
       download_photos: "fotoğraflarımı indir"
       download_xml: "xml dosyamı indir"
       edit_account: "Hesap düzenle"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Bilgilerimi Dışarı taşı"
+      getting_started: "Yeni Kullanıcı Tercihleri"
       liked: "...birisi gönderimi beğendiğinde?"
-      mentioned: "...benden bahsettiğinde?"
+      mentioned: "...benden bahsedildiğinde?"
       new_password: "Yeni parola"
-      private_message: "...özel mesaj gönderdiğinde?"
-      receive_email_notifications: "E-posta bildirimleri almak ..."
+      photo_export_unavailable: "Fotoğraf aktarma şu anda kullanılamıyor"
+      private_message: "...özel mesaj aldığında?"
+      receive_email_notifications: "E-posta bildirimi gönder..."
       reshared: "...birisi benim gönderimi tekrar paylaştığında?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
-      started_sharing: "...birisi benimle paylaşıma başladığında?"
-      stream_preferences: "Stream Preferences"
+      show_community_spotlight: "Topluluk Spotlight akışınızda gösterilsin mi?"
+      show_getting_started: "Başlarken etkin"
+      started_sharing: "...birisi benimle birşey paylaştığında?"
+      stream_preferences: "Akış Tercihleri"
       your_email: "E-posta"
-      your_handle: "Diaspora ID"
+      your_handle: "Diaspora ID'in (kimliğin)"
     getting_started: 
-      bold: "yönler"
-      community_spotlight: "Community spotlight"
-      community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Bağlan"
-      connect_to_your_other_social_networks: "Diğer sosyal ağlara bağlanın"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Harika insanlarla bağlantı kurun"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Profil Düzenle"
-      featured_tags: "Önerilen etiketler"
-      fill_out_your_profile: "Profilinizi doldurun"
-      find_friends: "Arkadaş bul"
-      find_friends_from_facebook: "Facebook arkadaşlarınızı bulun"
-      finished: "Bitti"
-      follow_your_interests: "İlginçlikleri izleyin"
-      get_updates_from_core: "Get updates about the project from the core team."
+      awesome_take_me_to_diaspora: "Harika! Diaspora* Git"
+      community_welcome: "Diaspora topluluğunda seni aramızda görmekten mutluyuz!"
       hashtag_explanation: "Etiketler, hakkında konuşmak ve ilgi alanlarını takip etmenize izin verir. Ayrıca yeni insanları Diaspora üzerinde bulmak için harika bir yoldur."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Profil bilgilerinizi doldurmak insanlar tarafından bulunmayı kolaylaştırır."
-      profile_fields: 
-        bio: "Hakkında"
-        birthday: "Doğum günü"
-        gender: "Cinsiyet"
-        location: "Yer"
-        name: "İsim"
-        photo: "Fotoğraf"
-        tags: "Etiketler"
-      search_for_hashtags: "#hashtags Ara"
-      search_for_people: "Kişi ara"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Diaspora'ya hoşgeldin!"
-      welcome_with_name: "Hoşgeldin, %{name}!"
+      hashtag_suggestions: "Sevdiğiniz etiketleri takip etmeyi denyin #resim, #film, #gif, vb."
+      hooking_up_fb: "Facebook hesabıza bağlanın"
+      saved: "Kaydedildi!"
+      we_can_speed_things_up: "Biz şeyler için biraz hız"
+      well_hello_there: "Merhaba!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "Diaspora için. Bu adınızı girin ve fotoğrafınızı çekin."
+      who_are_you: "Sen kimsin?"
     logged_out: 
       go_mobile: "Şimdi mobil olun."
       on_your_mobile_device: "mobil cihazınız üzerinden diaspora* mobile erişim."
-      signed_out: "You've signed out of Diaspora*"
-      simply_visit: "Simply visit"
-      works_on_modern: "Works on all modern smartphones"
+      signed_out: "Diaspora'dan çıkış yaptınız*"
+      simply_visit: "Basitçe ziyaret"
+      works_on_modern: "Tüm modern akıllı telefonlarda çalışır"
     public: 
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
     update: 
@@ -891,8 +886,8 @@ tr:
       language_not_changed: "Dil değişikliği başarısız"
       password_changed: "Parola Değişti"
       password_not_changed: "Parola değiştirilemedi"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Ayarları güncelleme başarısız."
+      settings_updated: "Ayarlar güncellendi"
       unconfirmed_email_changed: "E-posta değişti. Aktivasyon gerekli."
       unconfirmed_email_not_changed: "E-posta değişikliği başarısız oldu"
   webfinger: 
@@ -901,3 +896,4 @@ tr:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Hoş Geldin!"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 4c0bb8e86..97a9b01d8 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -64,6 +64,9 @@ uk:
       deselect_all: "Вимкнути всі"
       edit_aspect: "Редагувати %{name}"
       select_all: "Включити всі"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "Контакти в цьому аспекті не зможуть бачити один одного."
     contacts_visible: "Контакти в цьому аспекті можуть бачити один одного."
     create: 
@@ -89,7 +92,6 @@ uk:
       aspect_not_empty: "Аспект не порожній"
       remove: "видалити"
     index: 
-      community_spotlight: "У центрі уваги"
       cubbies: 
         explanation: "Cubbi.es це перша програма з розвитку діаспори."
         heading: "Підключення до Cubbi.es"
@@ -111,17 +113,17 @@ uk:
         need_help: "Потрібна допомога?"
         satisfaction: "%{link}: здійснювана товариством підтримка"
         tutorials_and_wiki: "%{tutorial} і %{wiki}: посібники, що створюються товариством, інструкції і новини"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Допоможіть %{pod} працювати швидко - купіть нашим серверам дозу кави, зробивши щомісячне пожертвування!"
       no_contacts: "Контакти відсутні"
       no_tags: "+ Знайти мітку"
       people_sharing_with_you: "Люди діляться з вами"
       post_a_message: "новий запис >>"
-      see_more_from_us: "Більше  від Д* товариства."
       services: 
         content: "Ви можете підключити до Діаспори наступні служби:"
         heading: "Підключення служб"
       unfollow_tag: "Не стежити за міткою #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Ваші аспекти"
     many: "%{count} аспект[-и, -ів]"
     move_contact: 
@@ -132,9 +134,9 @@ uk:
       create: "Створити"
       name: "Ім'я (видно тільки вам)"
     no_contacts_message: 
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
-      try_adding_some_more_contacts: "Ви можете знайти (зверху) або запросити (справа) інших користувачів."
+      community_spotlight: "рекомендованими користувачами"
+      or_spotlight: "Чи ви можете ділитися з %{link}"
+      try_adding_some_more_contacts: "Ви можете знайти або запросити інших користувачів."
       you_should_add_some_more_contacts: "Додайте більше контактів!"
     no_posts_message: 
       start_talking: "Тут ще ніхто нічого не сказав."
@@ -148,7 +150,7 @@ uk:
     selected_contacts: 
       manage_your_aspects: "Управління аспектами."
       no_contacts: "У вас тут доки немає жодного контакту."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Подивитися усіх рекомендованих"
       view_all_contacts: "Усі контакти"
     show: 
       edit_aspect: "редагувати аспект"
@@ -604,13 +606,13 @@ uk:
       unhappy: "Нещасні?"
       update: "Відновити"
     new: 
-      create_my_account: "Створити мій аккаунт"
+      create_my_account: "Створити мій аккаунт!"
       enter_email: "Введіть email"
       enter_password: "Введіть пароль"
       enter_password_again: "Повторіть пароль"
       enter_username: "Виберіть ім'я користувача (дозволені тільки латинські букви, цифри і підкреслення)"
       join_the_movement: "Приєднуйтеся до руху!"
-      sign_up_message: "Social Networking with a <3"
+      sign_up_message: "Соціальна мережа з <3"
   requests: 
     create: 
       sending: "Відправка"
@@ -652,6 +654,8 @@ uk:
   search: "Пошук"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Перевірка достовірності пройшла успішно."
     destroy: 
       success: "Ідентифікація успішно видалена."
@@ -711,15 +715,22 @@ uk:
     notification: 
       new: "Новий %{type} з %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "увійшли в %{service}"
       manage: "управління підключеними сервісами"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Публічні повідомлення доступні для читання усім, навіть за межами вашої Діаспори."
+      share: "Share"
       title: "Налаштування підключених послуг"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "усі"
       all_contacts: "всі контакти"
       discard_post: "Відмінити запис"
       make_public: "зробити публічним"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Опублікувати повідомлення для %{aspect}"
       posting: "Відправка..."
       publishing_to: "публікація в:"
@@ -730,6 +741,8 @@ uk:
     reshare: 
       reshare: "Поділитися повторно"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Не подобається"
       hide_and_mute: "Приховати і відключити повідомлення"
       like: "Мені подобається"
@@ -758,28 +771,30 @@ uk:
     show_more_comments: "Усі коментарі (%{number})"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Ваші аспекти"
+    aspects_stream: "Аспекти"
+    commented_on: "обговорювані"
+    community_spotlight_stream: "У центрі уваги"
     followed_tag: 
-      contacts_title: "People who dig these tags"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
-    mentioned_stream: "@Mentions"
+      add_a_tag: "Add a tag"
+      contacts_title: "Люди, що цікавляться цими мітками"
+      follow: "Follow"
+      title: "#Відстежувані мітки"
+    followed_tags_stream: "#Відстежувані мітки"
+    mentioned_stream: "@Згадування"
     mentions: 
       contacts_title: "Люди, що згадали вас"
-      title: "Ваші згадування"
+      title: "@Згадування"
     multi: 
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Люди у вашому Потоці"
+      title: "Потік"
+    posted: "опубліковані"
     public: 
       contacts_title: "Нещодавно написали"
       title: "Публічна Активність"
-    recently: "recently:"
+    recently: "останні:"
     tags: 
-      contacts_title: "Люди, яким подобаються ці мітки"
+      contacts_title: "Люди, яким подобаються ця мітка"
       title: "Записи, відмічені : %{tags}"
   tag_followings: 
     create: 
@@ -831,52 +846,32 @@ uk:
       edit_account: "Редагувати аккаунт"
       email_awaiting_confirmation: "Ми послали посилання для активації на %{unconfirmed_email}. Поки ви не пройдете по ньому і не активуєте нову адресу, ми використовуватимемо ваш колишній ящик %{email}."
       export_data: "Експорт інформації"
+      getting_started: "New User Prefrences"
       liked: "...кому-небудь подобається ваше повідомлення?"
       mentioned: "... ви згадані в повідомленні?"
       new_password: "Новий пароль"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "... ви отримуєте особисте повідомлення?"
       receive_email_notifications: "Отримувати повідомлення по електронній пошті, коли..."
       reshared: "...хтось ділиться вашим записом?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_community_spotlight: "Показувати рекомендованих користувачів в Потоці?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...хтось починає ділитися з вами?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Налаштування Потоку"
       your_email: "Ваша адреса електронної пошти"
       your_handle: "Ваш ідентифікатор в Діаспорі"
     getting_started: 
-      bold: "аспекти"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Товариство Діаспори раде вітати вас!"
-      connect_to: "Підключіться до"
-      connect_to_your_other_social_networks: "Підключіться до інших ваших соціальних мереж"
-      connect_to_your_other_social_networks_explanation_p1: "Підключення до служб дозволить вам публікувати записи на цих сервісах."
-      connect_to_your_other_social_networks_explanation_p2: "Підключившись до Facebook, ви також зможете знайти друзів, вже зареєстрованих в Діаспорі, і запросити інших."
-      connect_with_people: "Знайомтеся з цікавими людьми"
-      connect_with_people_explanation_pt1: "Спілкуйтеся з людьми, додаючи їх в один або декілька ваших %{bold}."
-      connect_with_people_explanation_pt2: "Аспекти - це інтуїтивно зрозумілий спосіб організації нових і вже знайомих співрозмовників, невидимий нікому, окрім вас і що дозволяє легко ділитися тільки з потрібними групами людей."
-      edit_profile: "Редагувати профіль"
-      featured_tags: "Стежити за рекомендованими мітками"
-      fill_out_your_profile: "Заповніть ваш профіль"
-      find_friends: "Знайти друзів"
-      find_friends_from_facebook: "знайти друзів з Facebook"
-      finished: "Завершено"
-      follow_your_interests: "Стежте за темами, що цікавлять вас"
-      get_updates_from_core: "Отримуйте новини проекту від команди розробників."
       hashtag_explanation: "Мітки дозволяють вам обговорювати і стежити за темами, що цікавлять вас. Це також відмінний спосіб пошуку однодумців в Діаспорі."
-      not_mandatory: "Виконання наступних дій розширить ваші можливості в Діаспорі, але це не є обов'язковим."
-      profile_description: "Допоможіть іншим знайти вас, заповнивши ваш профіль."
-      profile_fields: 
-        bio: "Біографія"
-        birthday: "День народження"
-        gender: "Стать"
-        location: "Розташування"
-        name: "Ім'я"
-        photo: "Фото"
-        tags: "Мітки"
-      search_for_hashtags: "Шукати по #мітках"
-      search_for_people: "Шукати людей"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Ласкаво просимо!"
-      welcome_with_name: "Ласкаво просимо %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Заходьте з мобільного!"
       on_your_mobile_device: "на вашому пристрої для доступу до мобільної версії Діаспори."
@@ -891,8 +886,8 @@ uk:
       language_not_changed: "Не вдалося змінити мову"
       password_changed: "Пароль змінений. Тепер ви можете увійти з новим паролем."
       password_not_changed: "Змінити пароль не вдалося"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Помилка при оновленні налаштувань"
+      settings_updated: "Налаштування збережені"
       unconfirmed_email_changed: "Email змінився. Потрібна активація."
       unconfirmed_email_not_changed: "Помилка зміни Email"
   webfinger: 
@@ -901,3 +896,4 @@ uk:
     no_person_constructed: "Жодна особа не може бути зібрана з цієї hcard."
     not_enabled: "webfinger не буде включений для хоста %{account}'s"
     xrd_fetch_failed: "Сталася помилка при отриманні xrd з %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 493e7b362..3a4842f3d 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -64,6 +64,9 @@ ur-PK:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "اس پہلو میں رابطے ایک دوسرے کو دیکھ نہیں سکیں گے۔"
     contacts_visible: "اس پہلو میں رابطے ایک دوسرے کو دیکھ سکیں گے۔"
     create: 
@@ -89,7 +92,6 @@ ur-PK:
       aspect_not_empty: "پہلو خالی نہیں ہے"
       remove: "ہٹائیے"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "ڈایسپورا کی پہلی ایپلی کیشن ہے جو ابھی تعمیر کے مرحلے میں ہے۔ cubbi.es"
         heading: "سے رابطہ قائم کریں Cubbi.es"
@@ -111,17 +113,17 @@ ur-PK:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "کوئ رابطہ نہیں"
       no_tags: "پیروی کرنے کے لئے ایک اصطلاح تلاش کریں +"
       people_sharing_with_you: "آپ کے ساتھ اشتراک کرنے والے افراد"
       post_a_message: "ایک پیغام شائع کیجیے"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "آپ ڈایسپورا کے لئے مندرجہ ذیل خدمات شامل کر سکتے ہیں :"
         heading: "خدمات کو جوڑیے"
       unfollow_tag: "پیروی بند کیجیے #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "آپکے پہلو"
     many: "%{count} پہلو"
     move_contact: 
@@ -652,6 +654,8 @@ ur-PK:
   search: "Search"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "Authentication successful."
     destroy: 
       success: "Successfully deleted authentication."
@@ -711,15 +715,22 @@ ur-PK:
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "Public messages will be available for others outside of Diaspora to see."
+      share: "Share"
       title: "Set up connected services"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "all"
       all_contacts: "all contacts"
       discard_post: "Discard post"
       make_public: "make public"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
@@ -730,6 +741,8 @@ ur-PK:
     reshare: 
       reshare: "Reshare"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "Dislike"
       hide_and_mute: "Hide and Mute"
       like: "Like"
@@ -763,7 +776,9 @@ ur-PK:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ ur-PK:
       edit_account: "Edit account"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "Export Data"
+      getting_started: "New User Prefrences"
       liked: "...someone likes your post?"
       mentioned: "...you are mentioned in a post?"
       new_password: "New password"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notifications when..."
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "Your email"
       your_handle: "Your diaspora id"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your %{bold}."
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "Edit Profile"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "Finished"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "Welcome!"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ ur-PK:
     no_person_constructed: "No person could be constructed from this hcard."
     not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
     xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 5f5ede2ba..660fe8c23 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -64,6 +64,9 @@ zh-CN:
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
+    aspect_stream: 
+      stay_updated: "Stay Updated"
+      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
     contacts_not_visible: "此视图中的好友相互不可见。"
     contacts_visible: "此视图中的好友相互可见。"
     create: 
@@ -89,7 +92,6 @@ zh-CN:
       aspect_not_empty: "此视图不是空的"
       remove: "删除"
     index: 
-      community_spotlight: "Community Spotlight"
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
         heading: "Connect to Cubbi.es"
@@ -111,17 +113,17 @@ zh-CN:
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
         tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
       no_contacts: "没有任何好友"
       no_tags: "No tags"
       people_sharing_with_you: "与您分享的人"
       post_a_message: "发布站内信>>"
-      see_more_from_us: "See more of the D* community."
       services: 
         content: "You can connect the following services to Diaspora:"
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
-      welcome: "Welcome"
+      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
     many: "%{count}个视图"
     move_contact: 
@@ -652,6 +654,8 @@ zh-CN:
   search: "搜索"
   services: 
     create: 
+      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
+      failure: "Authentication failed."
       success: "验证成功。"
     destroy: 
       success: "验证删除成功。"
@@ -711,15 +715,22 @@ zh-CN:
     notification: 
       new: "%{from} 有新的 %{type}"
     public_explain: 
+      control_your_audience: "Control your Audience"
       logged_in: "成功登录到 %{service}"
       manage: "管理已连线的服务"
+      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
       outside: "不使用 Diaspora 的人也能看到公开讯息。"
+      share: "Share"
       title: "设定连线服务"
+      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
     publisher: 
       all: "全部"
       all_contacts: "全部的好友"
       discard_post: "Discard post"
       make_public: "公开"
+      new_user_prefill: 
+        hello: "Hey everyone, I'm #%{new_user_tag}. "
+        i_like: "I'm interested in %{tags}."
       post_a_message_to: "在 %{aspect} 发布讯息"
       posting: "发布中……"
       publishing_to: "发布至："
@@ -730,6 +741,8 @@ zh-CN:
     reshare: 
       reshare: "重新分享"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "不喜欢"
       hide_and_mute: "Hide and Mute"
       like: "喜欢"
@@ -763,7 +776,9 @@ zh-CN:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "People who dig these tags"
+      follow: "Follow"
       title: "#Followed Tags"
     followed_tags_stream: "#Followed Tags"
     mentioned_stream: "@Mentions"
@@ -831,52 +846,32 @@ zh-CN:
       edit_account: "编辑帐号"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
       export_data: "资料导出"
+      getting_started: "New User Prefrences"
       liked: "…有人喜欢您发布的内容？"
       mentioned: "……当贴文中提到您时？"
       new_password: "新密码"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "……当收到私人信息时？"
       receive_email_notifications: "是否要在以下情况收到电子邮件通知……"
       reshared: "...someone reshares your post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
+      show_getting_started: "Re-enable Getting Started"
       started_sharing: "…有人开始与您分享？"
       stream_preferences: "Stream Preferences"
       your_email: "您的电子邮箱"
       your_handle: "您的 diaspora 帐号"
     getting_started: 
-      bold: "aspects"
-      community_spotlight: "Community spotlight"
+      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
-      connect_to: "Connect to"
-      connect_to_your_other_social_networks: "Connect to your other social networks"
-      connect_to_your_other_social_networks_explanation_p1: "Connecting to services will allow you to publish out to these services."
-      connect_to_your_other_social_networks_explanation_p2: "With Facebook, you also be able to find friends already on Diaspora and invite others."
-      connect_with_people: "Connect with cool people"
-      connect_with_people_explanation_pt1: "Connect with people by placing them into one or more of your"
-      connect_with_people_explanation_pt2: "Aspects are an intuitive way to group new and familar faces, private to you, allowing you to filter down or share with subsets of your contacts easily."
-      edit_profile: "编辑个人档案"
-      featured_tags: "Featured tags"
-      fill_out_your_profile: "Fill out your profile"
-      find_friends: "Find friends"
-      find_friends_from_facebook: "find friends from Facebook"
-      finished: "完成！"
-      follow_your_interests: "Follow your interests"
-      get_updates_from_core: "Get updates about the project from the core team."
       hashtag_explanation: "Hashtags allow you to talk about and follow your interests.  They're also a great way to find new people on Diaspora."
-      not_mandatory: "Completing the following steps will improve your Diaspora experience, but they are not mandatory."
-      profile_description: "Make it easier for people to find you by filling out your profile information."
-      profile_fields: 
-        bio: "Bio"
-        birthday: "Birthday"
-        gender: "Gender"
-        location: "Location"
-        name: "Name"
-        photo: "Photo"
-        tags: "Tags"
-      search_for_hashtags: "Search for #hashtags"
-      search_for_people: "Search for people"
-      see_all_community_spotlight: "See all community spotlight"
-      welcome: "欢迎来到 Diaspora！"
-      welcome_with_name: "Welcome, %{name}!"
+      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
+      hooking_up_fb: "hooking up your Facebook account"
+      saved: "Saved!"
+      we_can_speed_things_up: "We can speed things up a bit by"
+      well_hello_there: "Well, hello there!"
+      what_are_you_in_to: "What are you into?"
+      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
+      who_are_you: "Who are you?"
     logged_out: 
       go_mobile: "Now go mobile."
       on_your_mobile_device: "on your mobile device to access Diaspora* mobile."
@@ -901,3 +896,4 @@ zh-CN:
     no_person_constructed: "从这份 hcard 资料无法组建出联络人。"
     not_enabled: "%{account} 的主机似乎没有启用 webfinger"
     xrd_fetch_failed: "从 %{account} 这个帐号取得 xrd 时发生错误"
+  welcome: "Welcome!"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1e3f574fe..6dee55fbf 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -21,11 +21,11 @@ zh-TW:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "已被使用."
+              taken: "已經被使用了."
         request: 
           attributes: 
             from_id: 
-              taken: "與已存在的請求重複."
+              taken: "與已經存在了的請求重複."
         reshare: 
           attributes: 
             root_guid: 
@@ -33,12 +33,12 @@ zh-TW:
         user: 
           attributes: 
             email: 
-              taken: "已被使用."
+              taken: "已經被使用了."
             person: 
               invalid: "不合格."
             username: 
               invalid: "不被接受. 只能夠使用字母, 數字, 以及底線符號."
-              taken: "已被使用."
+              taken: "已經被使用了."
   ago: "%{time}前"
   all_aspects: "所有面向"
   application: 
@@ -64,6 +64,9 @@ zh-TW:
       deselect_all: "全不選"
       edit_aspect: "編輯%{name}"
       select_all: "全選"
+    aspect_stream: 
+      stay_updated: "隨時保持最新狀態"
+      stay_updated_explanation: "你的主要流水帳會充滿了你的聯絡人, 追蹤的標籤, 以及一些有創意的社群成員的貼文."
     contacts_not_visible: "此面向中的聯絡人無法看見彼此."
     contacts_visible: "此面向中的聯絡人可以看見彼此."
     create: 
@@ -89,7 +92,6 @@ zh-TW:
       aspect_not_empty: "面向不是空的"
       remove: "刪除"
     index: 
-      community_spotlight: "社群焦點"
       cubbies: 
         explanation: "Cubbi.es 是 Diaspora 的第一個應用程式, 目前正在開發中."
         heading: "與 Cubbi.es 連結"
@@ -111,23 +113,23 @@ zh-TW:
         need_help: "要幫忙嗎?"
         satisfaction: "%{link}: 社群支援的客服網站"
         tutorials_and_wiki: "%{tutorial} 和 %{wiki}: 社群支援的新手入門, 操作指南, 以及最新消息"
+      introduce_yourself: "這是你的流水帳. 跳進來介紹你自己吧."
       keep_us_running: "為了讓 %{pod} 高速奔馳, 用每月捐款來提供些咖啡存量給我們的伺服器吧!"
       no_contacts: "沒有任何聯絡人"
       no_tags: "+ 找個標籤來追蹤"
       people_sharing_with_you: "跟你分享的人"
       post_a_message: "貼訊息 >>"
-      see_more_from_us: "看看更多 D* 社群成員."
       services: 
         content: "你可以連結以下服務至 Diaspora:"
         heading: "連結服務"
       unfollow_tag: "停止追蹤#%{tag}"
-      welcome: "歡迎光臨"
+      welcome_to_diaspora: "歡迎來到 Diaspora, %{name}!"
       your_aspects: "你的面向"
     many: "%{count}個面向"
     move_contact: 
       error: "聯絡人移動錯誤: %{inspect}"
       failure: "因%{inspect}而沒有作用"
-      success: "聯絡人已移至新的面向"
+      success: "聯絡人移至新的面向了"
     new: 
       create: "建立"
       name: "名字(只有你自己看得到)"
@@ -148,14 +150,14 @@ zh-TW:
     selected_contacts: 
       manage_your_aspects: "管理你的面向."
       no_contacts: "你在這裡還沒有任何聯絡人."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "看所有的社群焦點"
       view_all_contacts: "檢視所有聯絡人"
     show: 
       edit_aspect: "編輯面向"
     two: "%{count}個面向"
     update: 
       failure: "你的面向 %{name} 因名稱太長了無法儲存."
-      success: "你的面向 %{name} 已編輯完成."
+      success: "你的面向 %{name} 已經編輯完成了."
     zero: "沒有面向"
   authorizations: 
     index: 
@@ -208,7 +210,7 @@ zh-TW:
   conversations: 
     create: 
       fail: "無效的訊息"
-      sent: "已送出訊息"
+      sent: "訊息送出去了"
     destroy: 
       success: "對話移除成功"
     helper: 
@@ -344,12 +346,12 @@ zh-TW:
       two: "%{actors} 也回應了 %{post_author} 的%{post_link}."
       zero: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
     also_commented_deleted: 
-      few: "%{actors}對已刪掉的貼文發表了意見."
-      many: "%{actors}對已刪掉的貼文發表了意見."
-      one: "%{actors}對已刪掉的貼文發表了意見."
-      other: "%{actors}對已刪掉的貼文發表了意見."
+      few: "%{actors} 回應了已刪掉的貼文."
+      many: "%{actors} 回應了已刪掉的貼文."
+      one: "%{actors} 回應了已刪掉的貼文."
+      other: "%{actors} 回應了已刪掉的貼文."
       two: "%{actors} 回應了已刪掉的貼文."
-      zero: "%{actors}對已刪掉的貼文發表了意見."
+      zero: "%{actors} 回應了已刪掉的貼文."
     comment_on_post: 
       few: "%{actors}對你的%{post_link}發表了意見."
       many: "%{actors}對你的%{post_link}發表了意見."
@@ -374,15 +376,15 @@ zh-TW:
         other: "和其他%{count}個人"
         two: "以及其他%{count}個"
         zero: "以外沒有其他人"
-      mark_all_as_read: "全部標示為已看過"
+      mark_all_as_read: "全部標示為看過了"
       notifications: "消息"
     liked: 
-      few: "%{actors}剛才說你的%{post_link}很讚."
-      many: "%{actors}剛才說你的%{post_link}很讚."
-      one: "%{actors}剛才說你的%{post_link}很讚."
-      other: "%{actors}剛才說你的%{post_link}很讚."
-      two: "%{actors} 剛剛說你的%{post_link}很讚."
-      zero: "%{actors}剛才說你的%{post_link}很讚."
+      few: "%{actors} 說你的%{post_link}很讚."
+      many: "%{actors} 說你的%{post_link}很讚."
+      one: "%{actors} 說你的%{post_link}很讚."
+      other: "%{actors} 說你的%{post_link}很讚."
+      two: "%{actors} 說你的%{post_link}很讚."
+      zero: "%{actors} 說你的%{post_link}很讚."
     liked_post_deleted: 
       few: "%{actors}說你刪掉了的貼文很讚."
       many: "%{actors}說你刪掉了的貼文很讚."
@@ -391,19 +393,19 @@ zh-TW:
       two: "%{actors} 說你刪掉的貼文很讚."
       zero: "%{actors}說你刪掉了的貼文很讚."
     mentioned: 
-      few: "%{actors}在%{post_link}中點到了你."
-      many: "%{actors}在%{post_link}中點到了你."
+      few: "%{actors} 在%{post_link}中點到了你."
+      many: "%{actors} 在%{post_link}中點到了你."
       one: "%{actors}在%{post_link}中點到了你."
-      other: "%{actors}在%{post_link}中點到了你."
+      other: "%{actors} 在%{post_link}中點到了你."
       two: "%{actors} 在%{post_link}中點到了你."
-      zero: "%{actors}在%{post_link}中點到了你."
+      zero: "%{actors} 在%{post_link}中點到了你."
     mentioned_deleted: 
-      few: "%{actors}在已刪掉的貼文中點到了你."
-      many: "%{actors}在已刪掉的貼文中點到了你."
-      one: "%{actors}在已刪掉的貼文中點到了你."
-      other: "%{actors}在已刪掉的貼文中點到了你."
+      few: "%{actors} 在已刪掉的貼文中點到了你."
+      many: "%{actors} 在已刪掉的貼文中點到了你."
+      one: "%{actors} 在已刪掉的貼文中點到了你."
+      other: "%{actors} 在已刪掉的貼文中點到了你."
       two: "%{actors} 在刪掉的貼文中點到了你."
-      zero: "%{actors}在已刪掉的貼文中點到了你."
+      zero: "%{actors} 在已刪掉的貼文中點到了你."
     post: "貼文"
     private_message: 
       few: "%{actors}寫了訊息給你."
@@ -444,7 +446,7 @@ zh-TW:
     email_sent_by_diaspora: "這封電子郵件是從 Diaspora 寄出. 如果你不想再收到這類的信件,"
     hello: "%{name}你好!"
     liked: 
-      liked: "%{name}剛剛說你的貼文讚"
+      liked: "%{name} 說你的貼文很讚"
       view_post: "看貼文 >"
     mentioned: 
       mentioned: "在貼文中點到了你:"
@@ -452,7 +454,7 @@ zh-TW:
     private_message: 
       reply_to_or_view: "回或看這次對話 >"
     reshared: 
-      reshared: "%{name} 剛剛轉貼了你的貼文"
+      reshared: "%{name} 轉貼了你的貼文"
       view_post: "看貼文 >"
     single_admin: 
       admin: "為您服務的 Diaspora 管理員"
@@ -486,7 +488,7 @@ zh-TW:
     other: "%{count}個聯絡人"
     person: 
       add_contact: "加入聯絡人"
-      already_connected: "已建立連結"
+      already_connected: "已經連結了"
       pending_request: "請求等候中"
       thats_you: "那是你耶!"
     profile_sidebar: 
@@ -526,7 +528,7 @@ zh-TW:
       runtime_error: "相片上傳失敗. 你確定安全帶有扣上嗎?"
       type_error: "相片上傳失敗. 你確定有加入任何圖片嗎?"
     destroy: 
-      notice: "已刪除相片."
+      notice: "相片刪掉了."
     edit: 
       editing: "編輯中"
     new: 
@@ -583,7 +585,7 @@ zh-TW:
       your_tags_placeholder: "像是: #電影 #貓咪 #旅行 #老師 #紐約"
     update: 
       failed: "個人檔案更新失敗"
-      updated: "已更新個人檔案"
+      updated: "個人檔案已經更新了"
   public: "公開"
   reactions: 
     few: "有%{count}次反應"
@@ -610,11 +612,11 @@ zh-TW:
       enter_password_again: "輸入與前面相同的密碼"
       enter_username: "選個使用者名稱(名稱只能包含拉丁字母,數字,以及底線字元)"
       join_the_movement: "參加這個行動!"
-      sign_up_message: "讓你 <3 的社交網路"
+      sign_up_message: "有 <3 的社交網路"
   requests: 
     create: 
       sending: "傳送中"
-      sent: "你已經要求要和 %{name} 分享. 他們下次登入 Diaspora 時就會看見."
+      sent: "你已經要求要和 %{name} 分享了. 他們下次登入 Diaspora 時就會看見."
     destroy: 
       error: "請選一個面向!"
       ignore: "忽略建立聯繫的請求."
@@ -631,7 +633,7 @@ zh-TW:
       existing: "既有聯絡人"
       manage_within: "管理聯絡人於"
     new_request_to_person: 
-      sent: "已送出!"
+      sent: "送出去了!"
   reshares: 
     comment_email_subject: "%{resharer} 轉貼了 %{author} 的貼文"
     create: 
@@ -652,6 +654,8 @@ zh-TW:
   search: "搜尋"
   services: 
     create: 
+      already_authorized: "已經有 Diaspora 識別碼為 %{diaspora_id} 的使用者被授權使用該 %{service_name} 帳號了."
+      failure: "認證失敗."
       success: "認證成功."
     destroy: 
       success: "認證刪除成功."
@@ -666,8 +670,8 @@ zh-TW:
       connect_to_twitter: "與 Twitter 連結"
       disconnect: "切斷連結"
       edit_services: "編輯服務"
-      logged_in_as: "已登入為"
-      no_services: "你還沒有任何已連結的服務."
+      logged_in_as: "已經登入為"
+      no_services: "你還沒有任何連結了的服務."
       really_disconnect: "切斷與 %{service} 的連結?"
     inviter: 
       click_link_to_accept_invitation: "使用這個連結來接受邀請"
@@ -711,15 +715,22 @@ zh-TW:
     notification: 
       new: "%{from} 有新的%{type}"
     public_explain: 
+      control_your_audience: "控制你的聽眾"
       logged_in: "已登入至 %{service}"
       manage: "管理已連線的服務"
+      new_user_welcome_message: "用\"#雜湊標籤\"來區分你的貼文, 並且找到跟你有共同興趣的人. 用\"@指指點點\"來呼叫正點的人."
       outside: "不使用 Diaspora 的人也能看到公開訊息."
+      share: "分享"
       title: "設定連線服務"
+      visibility_dropdown: "用這個下拉式選單來改變貼文的可見範圍.  (建議你第一篇設為公開.)"
     publisher: 
       all: "全部"
       all_contacts: "所有聯絡人"
       discard_post: "捨棄貼文"
       make_public: "公開"
+      new_user_prefill: 
+        hello: "大家好, 我是#%{new_user_tag}. "
+        i_like: "我對%{tags}有興趣."
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
       publishing_to: "發表至: "
@@ -730,6 +741,8 @@ zh-TW:
     reshare: 
       reshare: "轉貼"
     stream_element: 
+      connect_to_comment: "Connect to this user to comment on their post"
+      currently_unavailable: "commenting currently unavailable"
       dislike: "遜"
       hide_and_mute: "隱藏且消音"
       like: "讚"
@@ -763,9 +776,11 @@ zh-TW:
     commented_on: "有意見的"
     community_spotlight_stream: "社群焦點"
     followed_tag: 
+      add_a_tag: "Add a tag"
       contacts_title: "這些標籤的粉絲"
-      title: "#已追蹤的標籤"
-    followed_tags_stream: "#已追蹤的標籤"
+      follow: "Follow"
+      title: "#追蹤中的標籤"
+    followed_tags_stream: "#追蹤中的標籤"
     mentioned_stream: "@指指點點"
     mentions: 
       contacts_title: "對你指指點點過的人"
@@ -814,9 +829,9 @@ zh-TW:
   username: "使用者名稱"
   users: 
     confirm_email: 
-      email_confirmed: "已啟用E-Mail %{email}"
+      email_confirmed: "E-Mail %{email} 已經啟用了"
       email_not_confirmed: "無法啟用E-Mail. 連結有誤嗎?"
-    destroy: "帳號已鎖定. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora."
+    destroy: "帳號已經鎖定了. 關閉帳號可能需要20分鐘才能完成. 感謝你試用 Diaspora."
     edit: 
       also_commented: "...當有人也對你的聯絡人的貼文發表意見時?"
       change: "更改"
@@ -829,54 +844,34 @@ zh-TW:
       download_photos: "下載我的相片"
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
-      email_awaiting_confirmation: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
+      email_awaiting_confirmation: "我們已經將啟用連結寄到 %{unconfirmed_email} 給你. 在你使用該連結啟用新的位址之前, 我們還會繼續使用你原來的位址, 也就是 %{email}."
       export_data: "資料匯出"
+      getting_started: "新使用者偏好設定"
       liked: "...當有人對你的貼文說讚時?"
       mentioned: "...當貼文中點到你時?"
       new_password: "新的密碼"
+      photo_export_unavailable: "Photo exporting currently unavailable"
       private_message: "...當收到私人訊息時?"
       receive_email_notifications: "是否要在以下時機透過電子郵件接收消息..."
       reshared: "...有人轉貼你的貼文時?"
-      show_community_spotlight: "是否在流水帳中顯示社群焦點?"
+      show_community_spotlight: "要在流水帳中顯示社群焦點?"
+      show_getting_started: "重跑入門指南"
       started_sharing: "...當有人開始和你分享時?"
       stream_preferences: "流水帳偏好設定"
       your_email: "你的電子郵件"
       your_handle: "你的 diaspora 識別碼"
     getting_started: 
-      bold: "面向"
-      community_spotlight: "社群焦點"
+      awesome_take_me_to_diaspora: "帥! 帶我去 Diaspora*"
       community_welcome: "Diaspora 的社群歡迎你的到來!"
-      connect_to: "連結至"
-      connect_to_your_other_social_networks: "與其他社交網站連結"
-      connect_to_your_other_social_networks_explanation_p1: "與服務連結後你就可以發布內容到這些服務."
-      connect_to_your_other_social_networks_explanation_p2: "若連結至 Facebook, 你還可以找到已經使用 Diaspora 的朋友, 並且邀請其他人來."
-      connect_with_people: "與酷咖連結"
-      connect_with_people_explanation_pt1: "將別人放進你的任何一個或多個%{bold}中來與他們建立聯繫."
-      connect_with_people_explanation_pt2: "面向是區分新人或熟人的直覺方式, 並且只有你自己知道, 讓你可以輕易過濾他們, 或只和部份聯絡人分享."
-      edit_profile: "編輯個人檔案"
-      featured_tags: "追蹤明星標籤"
-      fill_out_your_profile: "填寫個人檔案"
-      find_friends: "找朋友"
-      find_friends_from_facebook: "從 Facebook 找朋友"
-      finished: "完成了"
-      follow_your_interests: "追蹤你的興趣"
-      get_updates_from_core: "從核心團隊得到專案的最新變動."
       hashtag_explanation: "標籤讓你可以討論及追蹤你的興趣. 並且也是在 Diaspora 找到新朋友的好方法."
-      not_mandatory: "完成接下來的步驟可以提昇你在 Diaspora 體驗, 不過都是非必要的項目."
-      profile_description: "填寫好個人檔案可以讓其他人更容易找到你."
-      profile_fields: 
-        bio: "經歷"
-        birthday: "生日"
-        gender: "性別"
-        location: "位置"
-        name: "名字"
-        photo: "相片"
-        tags: "標籤"
-      search_for_hashtags: "搜尋\"#雜湊標籤\""
-      search_for_people: "搜尋人"
-      see_all_community_spotlight: "看所有的社群焦點"
-      welcome: "歡迎光臨!"
-      welcome_with_name: "歡迎光臨, %{name}!"
+      hashtag_suggestions: "試試看追蹤像是#藝術, #電影, #gif 等標籤."
+      hooking_up_fb: "連接你的 Facebook 帳號"
+      saved: "存好了!"
+      we_can_speed_things_up: "我們可以藉由"
+      well_hello_there: "嗨, 你好!"
+      what_are_you_in_to: "你對什麼有興趣?"
+      what_facebook_does: "讓你儘快開始使用 Diaspora. 這個步驟會拿你在 Facebook 的名字和照片來用, 並開啟多重發表."
+      who_are_you: "你是誰?"
     logged_out: 
       go_mobile: "開始行動瀏覽."
       on_your_mobile_device: "就可以使用 Diaspora* 行動版."
@@ -886,14 +881,14 @@ zh-TW:
     public: 
       does_not_exist: "不存在 %{username} 這個使用者!"
     update: 
-      email_notifications_changed: "已更改電郵通知"
-      language_changed: "已更改語言"
+      email_notifications_changed: "電郵通知已經更改了"
+      language_changed: "語言已經更改了"
       language_not_changed: "語言更改失敗"
-      password_changed: "已更改密碼. 現在起你可以用新的密碼登入了."
+      password_changed: "密碼已經更改了. 從現在起你可以用新的密碼登入."
       password_not_changed: "密碼更改失敗"
       settings_not_updated: "設定更新失敗"
-      settings_updated: "設定已更新"
-      unconfirmed_email_changed: "已更改E-Mail. 必須要啟動使用."
+      settings_updated: "設定更新了"
+      unconfirmed_email_changed: "E-Mail更改了. 必須要啟動使用."
       unconfirmed_email_not_changed: "E-Mail更改失敗"
   webfinger: 
     fetch_failed: "擷取 %{profile_url} 的 webfinger 個人檔案失敗"
@@ -901,3 +896,4 @@ zh-TW:
     no_person_constructed: "從這份 hcard 資料無法組出聯絡人."
     not_enabled: "%{account} 的主機似乎沒有啟用 webfinger"
     xrd_fetch_failed: "從 %{account} 這個帳號取得 xrd 時發生錯誤"
+  welcome: "歡迎光臨!"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index 4ef3df2d4..b092168ff 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -9,6 +9,8 @@ ar:
       add_to_aspect: "أضف إلى فئة"
       all_aspects: "جميع الفئات"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "في {{count}} فئات"
         many: "في {{count}} فئات"
@@ -26,8 +28,15 @@ ar:
     confirm_dialog: "هل أنت متأكد؟"
     failed_to_like: "فشل في [أعجبني]"
     failed_to_post_message: "فشل في نشر رسالة!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "لا توجد أية رسائل أخرى"
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "حدد فئة واحدة على الأقل"
       limited: "محدودة - مشاركتك ستكون متاحة لجهات إتصالك فقط"
@@ -36,6 +45,8 @@ ar:
       duplicate: "أعدت نشر هذه المشاركة مسبقا!"
     search_for: "إبحث عن {{name}}"
     show_more: "المزيد"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "منذ يوم"
       days: "منذ %d أيام"
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index 37f1ac8a8..b56b36c34 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -9,6 +9,8 @@ bg:
       add_to_aspect: "Избиране на аспект(и)"
       all_aspects: "Във всеки аспект"
       select_aspects: "Избиране на аспект(и)"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "В {{count}} аспекта"
         many: "В {{count}} аспекта"
@@ -26,8 +28,15 @@ bg:
     confirm_dialog: "Сигурни ли сте?"
     failed_to_like: "Публикацията не бе харесана!"
     failed_to_post_message: "Съобщението не бе публикувано!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Няма повече публикации."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Трябва да публикувате в поне един аспект"
       limited: "Ограничено - публикацията ще бъде видима само за хората, с които я споделите"
@@ -36,6 +45,8 @@ bg:
       duplicate: "Вече сте споделили публикацията!"
     search_for: "Търсене за {{name}}"
     show_more: "покажи още"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "ден"
       days: "%d дни"
diff --git a/config/locales/javascript/javascript.br.yml b/config/locales/javascript/javascript.br.yml
index 5e7b22a59..df4dd5d61 100644
--- a/config/locales/javascript/javascript.br.yml
+++ b/config/locales/javascript/javascript.br.yml
@@ -9,6 +9,8 @@ br:
       add_to_aspect: "Add to aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspects"
         many: "In {{count}} aspects"
@@ -26,8 +28,15 @@ br:
     confirm_dialog: "Emaoc'h sur?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No more posts."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ br:
       duplicate: "You've already reshared that post!"
     search_for: "Klask war-lerc'h {{name}}"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "un devezh"
       days: "%d a zevezhioù"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 0c896dcd6..7dd11e647 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -9,6 +9,8 @@ cs:
       add_to_aspect: "Přidat do aspektu"
       all_aspects: "Všechny aspekty"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "Ve {{count}} aspektech"
         many: "V {{count}} aspektech"
@@ -26,8 +28,15 @@ cs:
     confirm_dialog: "Jste si jisti?"
     failed_to_like: "Oblíbení se nezdařilo!"
     failed_to_post_message: "Odeslání příspěvku se nezdařilo!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Žádné další příspěvky."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu"
       limited: "Omezený - váše zpráva bude přístupná pouze lidem z vybraných aspektů"
@@ -36,6 +45,8 @@ cs:
       duplicate: "Tato zprávu už sdílíte!"
     search_for: "Hledat {{name}}"
     show_more: "zobrazit více"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "1 dnem"
       days: "%d dny"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 907019f1f..c2d2ee1a4 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -9,6 +9,8 @@ da:
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
       select_aspects: "Vælg aspekter"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "I {{count}} aspekter"
         many: "I {{count}} aspekter"
@@ -26,8 +28,15 @@ da:
     confirm_dialog: "Er du sikker?"
     failed_to_like: "Kunne ikke synes om!"
     failed_to_post_message: "Kunne ikke indsende besked!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Ikke flere indlæg."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Du skal dele med mindst et aspekt"
       limited: "Begrænset - dit indlæg vil kun blive set af dem du deler med"
@@ -36,6 +45,8 @@ da:
       duplicate: "Du har allerede delt dét indlæg!"
     search_for: "Søg efter {{name}}"
     show_more: "Vis mere"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "en dag"
       days: "%d dage"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 1fd2a3518..ae0d69ec5 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -9,6 +9,8 @@ de:
       add_to_aspect: "Zu Aspekt hinzufügen"
       all_aspects: "Alle Aspekte"
       select_aspects: "Wähle Aspekte aus"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} Aspekten"
         many: "In {{count}} Aspekten"
@@ -26,16 +28,25 @@ de:
     confirm_dialog: "Bist du dir sicher?"
     failed_to_like: "Gefällt mir fehlgeschlagen."
     failed_to_post_message: "Konnte Beitrag nicht senden!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Keine weiteren Beiträge."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
-      limited: "Eingeschränkt - dein Beitrag wird nur Leuten, mit denen du teilst, sichtbar sein"
+      limited: "Eingeschränkt - dein Beitrag wird nur Leuten sichtbar sein, mit denen du teilst"
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares: 
-      duplicate: "Du hast diesen Beitrag bereits wiederholt!"
+      duplicate: "Du hast diesen Beitrag bereits weitergesagt!"
     search_for: "Nach {{name}} suchen"
     show_more: "Mehr zeigen"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "einem Tag"
       days: "%d Tagen"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 9ea294163..8cf47eff0 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -8,7 +8,9 @@ el:
     aspect_dropdown: 
       add_to_aspect: "Προσθήκη σε πτυχή"
       all_aspects: "Όλες οι πτυχές"
-      select_aspects: "Select aspects"
+      select_aspects: "Επιλογή πτυχών"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "Σε {{count}} πτυχές"
         many: "Σε {{count}} πτυχές"
@@ -26,8 +28,15 @@ el:
     confirm_dialog: "Είστε σίγουρος/η;"
     failed_to_like: "Αποτυχία!"
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Πρέπει να κάνετε δημοσίευση σε τουλάχιστον μια πτυχή"
       limited: "Περιορισμένο - οι δημοσιεύσεις σας θα είναι ορατές μόνο από τα άτομα με τα οποία διαμοιράζεστε. "
@@ -36,6 +45,8 @@ el:
       duplicate: "Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!"
     search_for: "Αναζήτηση για {{name}}"
     show_more: "Προβολή περισσότερων"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "μία μέρα"
       days: "%d μέρες"
diff --git a/config/locales/javascript/javascript.en_1337.yml b/config/locales/javascript/javascript.en_1337.yml
index 23ffdaa01..a1d118700 100644
--- a/config/locales/javascript/javascript.en_1337.yml
+++ b/config/locales/javascript/javascript.en_1337.yml
@@ -9,6 +9,8 @@ en_1337:
       add_to_aspect: "4DD N00B"
       all_aspects: "4LL 45P3C75"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "1N {{count}} 45P3C75"
         many: "1N {{count}} 45P3C75"
@@ -26,8 +28,15 @@ en_1337:
     confirm_dialog: "5UR3?"
     failed_to_like: "F41L3D 2 <3!"
     failed_to_post_message: "F41L3D 2 53ND 5P4M!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "EOF"
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Y0U MU57 70 PUBL15CH 47 L3457 1 4SP3C7"
       limited: "L1M173D - Y0UR 5P4M W1LL 0NLY B33 533N BY N00B5 U 4R3 5H4R1NG W17H!"
@@ -36,6 +45,8 @@ en_1337:
       duplicate: "U H4V3 4LR34DY R35P4MM3D 7HI5!"
     search_for: "S34RCH F0R {{name}}"
     show_more: "5H0W M0R3!"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "4 D4Y"
       days: "%d D4Y5"
diff --git a/config/locales/javascript/javascript.en_pirate.yml b/config/locales/javascript/javascript.en_pirate.yml
index f91bac66f..dd110b0ca 100644
--- a/config/locales/javascript/javascript.en_pirate.yml
+++ b/config/locales/javascript/javascript.en_pirate.yml
@@ -9,6 +9,8 @@ en_pirate:
       add_to_aspect: "Add to aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspects"
         many: "In {{count}} aspects"
@@ -26,8 +28,15 @@ en_pirate:
     confirm_dialog: "Are you sure?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No more posts."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ en_pirate:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "a day"
       days: "%d days"
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index e30d2fed2..0fc93d3ad 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -9,6 +9,8 @@ en_shaw:
       add_to_aspect: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
         many: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
@@ -26,8 +28,15 @@ en_shaw:
     confirm_dialog: "𐑸 𐑿 𐑖𐑻?"
     failed_to_like: "𐑓𐑱𐑤𐑛 𐑑 𐑤𐑲𐑒!"
     failed_to_post_message: "𐑓𐑱𐑤𐑛 𐑑 𐑐𐑴𐑕𐑑 𐑥𐑧𐑕𐑩𐑡!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "𐑯𐑴 𐑥𐑹 𐑐𐑴𐑕𐑑𐑕."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ en_shaw:
       duplicate: "𐑿𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑮𐑦𐑖𐑺𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑!"
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     show_more: "𐑖𐑴 𐑥𐑹"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "𐑩 𐑛𐑱"
       days: "%d 𐑛𐑱𐑟"
diff --git a/config/locales/javascript/javascript.eo.yml b/config/locales/javascript/javascript.eo.yml
index 7723583b7..70ef0b84e 100644
--- a/config/locales/javascript/javascript.eo.yml
+++ b/config/locales/javascript/javascript.eo.yml
@@ -9,6 +9,8 @@ eo:
       add_to_aspect: "Aldoni al aspekto"
       all_aspects: "Ĉiuj aspektoj"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "En {{count}} aspektoj"
         many: "En {{count}} aspektoj"
@@ -26,8 +28,15 @@ eo:
     confirm_dialog: "ĉu vi certas?"
     failed_to_like: "Ne povis ŝati!"
     failed_to_post_message: "Ne povis afiŝi mesaĝon!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Ne pli afiŝoj."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Vi devus eldoni al almenaŭ unu aspekto"
       limited: "Malpublika - via afiŝo nur vidoteblos de homoj, kun kiuj vi partoprenas"
@@ -36,6 +45,8 @@ eo:
       duplicate: "Vi jam repartoprenis tiun afiŝon!"
     search_for: "Serĉi por {{name}}"
     show_more: "vidi plu"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "unu tago"
       days: "%d tagoj"
diff --git a/config/locales/javascript/javascript.es-AR.yml b/config/locales/javascript/javascript.es-AR.yml
index 2eeed1459..95bb10685 100644
--- a/config/locales/javascript/javascript.es-AR.yml
+++ b/config/locales/javascript/javascript.es-AR.yml
@@ -9,6 +9,8 @@ es-AR:
       add_to_aspect: "Agregar al aspecto"
       all_aspects: "Todos los aspectos"
       select_aspects: "Selecciona aspectos"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "En {{count}} aspectos"
         many: "En {{count}} aspectos"
@@ -26,8 +28,15 @@ es-AR:
     confirm_dialog: "¿Estás seguro?"
     failed_to_like: "¡No pudo marcarse como 'Me gusta'!"
     failed_to_post_message: "¡No pudo publicarse el mensaje!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No hay más publicaciones."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Tenés que publicarlo en, por lo menos, un aspecto"
       limited: "Limitada - tu publicación sera vista solo por la gente con quien la compartes "
@@ -36,6 +45,8 @@ es-AR:
       duplicate: "Ya compartiste esa publicación!"
     search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "un día"
       days: "%d días"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index f45b4d004..1615ec1ce 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -9,6 +9,8 @@ es:
       add_to_aspect: "Añadir contacto"
       all_aspects: "Todos los aspectos"
       select_aspects: "Elige los aspectos"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "En {{count}} aspectos"
         many: "En {{count}} aspectos"
@@ -26,8 +28,15 @@ es:
     confirm_dialog: "¿Estás seguro?"
     failed_to_like: "¡Ha fallado tu aprobación!"
     failed_to_post_message: "¡Fallo al publicar el mensaje!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No hay más publicaciones."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Debes publicarlo en al menos un aspecto"
       limited: "Limitado - tu publicación solo será visible para las personas con quien compartes"
@@ -36,6 +45,8 @@ es:
       duplicate: "¡Ya compartiste esa publicación!"
     search_for: "Buscar a {{name}}"
     show_more: "mostrar más"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "un día"
       days: "%d días"
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 43c534a87..f158cffef 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -9,6 +9,8 @@ eu:
       add_to_aspect: "Alderdira gehitu"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "{{count}} alderdietan"
         many: "{{count}} alderdietan"
@@ -26,8 +28,15 @@ eu:
     confirm_dialog: "Ziur al zaude?"
     failed_to_like: "Huts gustoko egitean!"
     failed_to_post_message: "Huts egin du mezuaren bidalketak!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Mezu gehiagorik ez dago."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Gutxienez alderdi batean partekatu behar duzu"
       limited: "Mugatua - zure mezua aukeratu duzun jendeak bakarrik ikusiko du"
@@ -36,6 +45,8 @@ eu:
       duplicate: "Dagoeneko birpartekatu duzu mezu hori!"
     search_for: "Bilatu {{name}}"
     show_more: "erakutsi gehiago"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "egun bat"
       days: "%d egun"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 379386adb..75eca8a53 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -9,6 +9,8 @@ fi:
       add_to_aspect: "Lisää näkymään"
       all_aspects: "Kaikki näkymät"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "{{count}}:ssa näkymässä"
         many: "{{count}}:ssa näkymässä"
@@ -26,8 +28,15 @@ fi:
     confirm_dialog: "Oletko varma?"
     failed_to_like: "Tykkääminen epäonnistui!"
     failed_to_post_message: "Viestin lähetys epäonnistui!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Ei enempää viestejä."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Sinun täytyy julkaista vähintään yhdelle näkymälle."
       limited: "Rajoitettu - viestisi näkyy vain ihmisille, joiden kanssa jaat"
@@ -36,6 +45,8 @@ fi:
       duplicate: "Olet jo uudelleenjakanut viesti!"
     search_for: "Etsi nimellä {{name}}"
     show_more: "näytä lisää"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "päivä"
       days: "%d päivää"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index d1b2ab05e..888e50983 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -9,6 +9,8 @@ fr:
       add_to_aspect: "Ajouter le contact"
       all_aspects: "Tous les aspects"
       select_aspects: "Choisir les aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "Dans {{count}} aspects"
         many: "Dans {{count}} aspects"
@@ -26,8 +28,15 @@ fr:
     confirm_dialog: "Êtes-vous sûr ?"
     failed_to_like: "Impossible d'aimer !"
     failed_to_post_message: "Impossible de partager le message !"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Pas d'autres messages."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Vous devez créer au moins un aspect"
       limited: "Limité - votre message ne sera vu que par des gens avec qui vous partagez"
@@ -36,6 +45,8 @@ fr:
       duplicate: "Vous avez déjà repartagé ce message !"
     search_for: "Chercher {{name}}"
     show_more: "Voir plus"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "environ un jour"
       days: "environ %d jours"
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index a336f85db..496655f7e 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -9,6 +9,8 @@ he:
       add_to_aspect: "הוספה להיבט"
       all_aspects: "כל ההיבטים"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "ב־{{count}} היבטים"
         many: "ב־{{count}} היבטים"
@@ -26,8 +28,15 @@ he:
     confirm_dialog: "בבטחה?"
     failed_to_like: "הסימון ב'אהבתי' נכשל!"
     failed_to_post_message: "פרסום ההודעה נכשל!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "אין רשומות נוספות."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "עליך לפרסם היבט אחד לפחות"
       limited: "מוגבל - הרשומה שלך תהיה גלויה אך ורק לאנשים אתם בחרת לשתף"
@@ -36,6 +45,8 @@ he:
       duplicate: "כבר שיתפת רשומה זו מחדש!"
     search_for: "חיפוש אחר {{name}}"
     show_more: "הצגת עוד"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "יום"
       days: "%d ימים"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 21591e348..0abfd7861 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -9,6 +9,8 @@ hu:
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
       select_aspects: "Csoportok kiválasztása"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "{{count}} csoportban"
         many: "{{count}} csoportban"
@@ -26,8 +28,15 @@ hu:
     confirm_dialog: "Biztos vagy benne?"
     failed_to_like: "Hiba"
     failed_to_post_message: "Üzenet elküldése sikertelen!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Nincs több bejegyzés."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Minimum 1 csoportnak meg kell osztanod!"
       limited: "Korlátozott - csak az ismerőseid láthatják ezt a bejegyzést"
@@ -36,6 +45,8 @@ hu:
       duplicate: "Már újraosztottad ezt a bejegyzést!"
     search_for: "{{name}} keresése."
     show_more: "tovább"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "egy nappal"
       days: "%d nappal"
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 8e0a81b2c..2e719ad1f 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -9,6 +9,8 @@ id:
       add_to_aspect: "Add to aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspects"
         many: "In {{count}} aspects"
@@ -26,8 +28,15 @@ id:
     confirm_dialog: "Are you sure?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No more posts."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ id:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "sehari"
       days: "%d hari"
diff --git a/config/locales/javascript/javascript.is.yml b/config/locales/javascript/javascript.is.yml
index 959b608ba..f92aa52e6 100644
--- a/config/locales/javascript/javascript.is.yml
+++ b/config/locales/javascript/javascript.is.yml
@@ -9,6 +9,8 @@ is:
       add_to_aspect: "Add to aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspects"
         many: "In {{count}} aspects"
@@ -26,8 +28,15 @@ is:
     confirm_dialog: "Ertu viss?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "No more posts."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "You must publish to at least one aspect"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ is:
       duplicate: "You've already reshared that post!"
     search_for: "Search for {{name}}"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "á dag"
       days: "%d dagar"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index f30e43de9..f077fbd03 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -9,6 +9,8 @@ it:
       add_to_aspect: "Aggiungi"
       all_aspects: "Tutti gli aspetti"
       select_aspects: "Scegli gli aspetti"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspetti"
         many: "In {{count}} aspetti"
@@ -26,8 +28,15 @@ it:
     confirm_dialog: "Sei sicuro?"
     failed_to_like: "Valutazione fallita!"
     failed_to_post_message: "Invio messaggio fallito!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Non ci sono altri post."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Devi condividere con almeno un aspetto"
       limited: "Non pubblico - il tuo post sarà visibile solamente a coloro con cui lo condividi"
@@ -36,6 +45,8 @@ it:
       duplicate: "Hai già condiviso questo post!"
     search_for: "Ricerca per {{name}}"
     show_more: "continua..."
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "un giorno"
       days: "%d giorni"
diff --git a/config/locales/javascript/javascript.ja.yml b/config/locales/javascript/javascript.ja.yml
index 4ef9dd20c..34ef647fc 100644
--- a/config/locales/javascript/javascript.ja.yml
+++ b/config/locales/javascript/javascript.ja.yml
@@ -9,6 +9,8 @@ ja:
       add_to_aspect: "Add to aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspects"
         many: "In {{count}} aspects"
@@ -26,8 +28,15 @@ ja:
     confirm_dialog: "本当にいいですか。"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "投稿はこれ以上ありません。"
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "アスペクトを選択してから投稿してください。"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ ja:
       duplicate: "You've already reshared that post!"
     search_for: "{{name}}を検索する"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "1日"
       days: "%d日"
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index ef909279c..4cc098176 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -9,6 +9,8 @@ ko:
       add_to_aspect: "애스펙에 넣기"
       all_aspects: "모든 에스팩"
       select_aspects: "에스팩 선택"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "애스펙 {{count}}개 안에 있습니다"
         many: "애스펙 {{count}}개 안에 있습니다"
@@ -26,8 +28,15 @@ ko:
     confirm_dialog: "확실합니까?"
     failed_to_like: "좋아요를 실패했습니다!"
     failed_to_post_message: "공유물 올리기를 실패했습니다!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "공유물이 더 없습니다."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "공유하려면 적어도 한 애스펙을 골라야 합니다."
       limited: "제한됨 - 내 공유물을 나와 공유하고 있는 사람들만 볼 수 있습니다"
@@ -36,6 +45,8 @@ ko:
       duplicate: "이미 재공유된 공유물입니다!"
     search_for: "{{name}} 검색"
     show_more: "더 보기"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "하루"
       days: "%d일"
diff --git a/config/locales/javascript/javascript.nb.yml b/config/locales/javascript/javascript.nb.yml
index c53a61eb3..98fd6f52e 100644
--- a/config/locales/javascript/javascript.nb.yml
+++ b/config/locales/javascript/javascript.nb.yml
@@ -9,6 +9,8 @@ nb:
       add_to_aspect: "Legg til kategori"
       all_aspects: "Alle kategorier"
       select_aspects: "Velg kategori"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "I {{count}} kategorier"
         many: "I {{count}} kategorier"
@@ -26,8 +28,15 @@ nb:
     confirm_dialog: "Er du sikker?"
     failed_to_like: "Klarte ikke å like!"
     failed_to_post_message: "Klarte ikke å publisere post!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Ingen flere innlegg."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Du må poste til minst ett aspekt"
       limited: "Begrenset - posten din vil bare være synlig for de du deler med"
@@ -36,6 +45,8 @@ nb:
       duplicate: "du har allerede delt denne posten!"
     search_for: "Søk etter {{name}}"
     show_more: "vis mer"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "en dag"
       days: "%d dager"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index de3d4fbc8..d79cd6740 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -8,7 +8,9 @@ nl:
     aspect_dropdown: 
       add_to_aspect: "Voeg toe aan aspect"
       all_aspects: "Alle aspecten"
-      select_aspects: "Select aspects"
+      select_aspects: "Selecteer aspecten"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "In {{count}} aspecten"
         many: "In {{count}} aspecten"
@@ -17,17 +19,24 @@ nl:
         two: "In {{count}} aspecten"
         zero: "Voeg toe aan aspect"
     aspect_navigation: 
-      deselect_all: "Deselect all"
-      no_aspects: "No aspects selected"
-      select_all: "Select all"
+      deselect_all: "Alles deselecteren"
+      no_aspects: "Geen aspecten geselecteerd"
+      select_all: "Alles selecteren"
     comments: 
       hide: "verberg reacties"
       show: "laat reacties zien"
     confirm_dialog: "Weet je het zeker?"
     failed_to_like: "Leuk vinden mislukt!"
     failed_to_post_message: "Bericht plaatsen mislukt!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Geen posts meer."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
       limited: "Gelimiteerd - je post is alleen zichtbaar voor de mensen waarmee je hem deelt"
@@ -36,6 +45,8 @@ nl:
       duplicate: "Je hebt deze post al doorgegeven!"
     search_for: "Zoek naar {{name}}"
     show_more: "laat meer zien"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "een dag"
       days: "%d dagen"
diff --git a/config/locales/javascript/javascript.nn.yml b/config/locales/javascript/javascript.nn.yml
index e036b7049..6abcdcb6d 100644
--- a/config/locales/javascript/javascript.nn.yml
+++ b/config/locales/javascript/javascript.nn.yml
@@ -9,6 +9,8 @@ nn:
       add_to_aspect: "Legg til kontakt"
       all_aspects: "Alle aspekta"
       select_aspects: "Vel aspekt"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "I {{count}} aspekt"
         many: "I {{count}} aspekt"
@@ -26,8 +28,15 @@ nn:
     confirm_dialog: "Er du sikker?"
     failed_to_like: "Like-funksjonen feila."
     failed_to_post_message: "Klarte ikkje å senda meldinga."
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Ingen fleire meldingar."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Du må offentleggjera til minst eitt aspekt"
       limited: "Avgrensa - berre personar du deler med vil kunna sjå meldinga"
@@ -36,6 +45,8 @@ nn:
       duplicate: "Du har allereie delt den meldinga."
     search_for: "Leit etter {{name}}"
     show_more: "syn meir"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "om dagen"
       days: "%d dagar"
diff --git a/config/locales/javascript/javascript.pl.yml b/config/locales/javascript/javascript.pl.yml
index cb0502437..f315596cb 100644
--- a/config/locales/javascript/javascript.pl.yml
+++ b/config/locales/javascript/javascript.pl.yml
@@ -9,6 +9,8 @@ pl:
       add_to_aspect: "Dodaj kontakt"
       all_aspects: "Wszystkie aspekty"
       select_aspects: "Wybierz aspekty"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "W {{count}} aspektach"
         many: "W {{count}} aspektach"
@@ -26,8 +28,15 @@ pl:
     confirm_dialog: "Czy @{m,f:jesteś|n:na}{ pew}{m:ien|f:na|n:no}?"
     failed_to_like: "Nie udało się polubić!"
     failed_to_post_message: "Nie można wysłać wiadomości!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Nie ma więcej wpisów."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Musisz udostępnić dla co najmniej jednego aspektu"
       limited: "Ograniczony - wpis będzie widoczny tylko dla wybranej grupy osób"
@@ -36,6 +45,8 @@ pl:
       duplicate: "Już udostępni@{m:łeś|f:łaś|n:ono} ponownie ten wpis!"
     search_for: "Znajdź: {{name}}"
     show_more: "wyświetl więcej"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "dzień"
       days: "%d dni"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index c320092ca..588d10a33 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -9,6 +9,8 @@ pt-BR:
       add_to_aspect: "Adicione para aspecto"
       all_aspects: "Todos aspectos"
       select_aspects: "Selecione os aspectos"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "Em {{count}} aspectos"
         many: "Em {{count}} aspectos"
@@ -26,8 +28,15 @@ pt-BR:
     confirm_dialog: "Tem certeza?"
     failed_to_like: "Falhou ao curtir!"
     failed_to_post_message: "Falha em postar a mensagem!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Não há mais postagem."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Você deve publicar pelo menos um aspecto"
       limited: "Limitada - a sua postagem será visível apenas para as pessoas que você compartilha."
@@ -36,6 +45,8 @@ pt-BR:
       duplicate: "Você já compartilhou essa postagem."
     search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "um dia"
       days: "%d dias"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index 9e44c095a..503a55aee 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -6,36 +6,47 @@
 pt-PT: 
   javascripts: 
     aspect_dropdown: 
-      add_to_aspect: "Adicionar ao aspecto"
+      add_to_aspect: "Adicionar contacto"
       all_aspects: "Todos os aspectos"
-      select_aspects: "Select aspects"
+      select_aspects: "Seleccionar aspectos"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "Em {{count}} aspectos"
         many: "Em {{count}} aspectos"
         one: "Em {{count}} aspecto"
         other: "Em {{count}} aspectos"
         two: "Em {{count}} aspectos"
-        zero: "Adicionar ao aspecto"
+        zero: "Seleccione os aspectos"
     aspect_navigation: 
-      deselect_all: "Deselect all"
-      no_aspects: "No aspects selected"
-      select_all: "Select all"
+      deselect_all: "Anular todos"
+      no_aspects: "Nenhuns aspectos seleccionados"
+      select_all: "Seleccionar todos"
     comments: 
       hide: "esconder comentários"
       show: "mostrar todos os comentários"
     confirm_dialog: "Tem a certeza?"
     failed_to_like: "Falhou ao gostar!"
     failed_to_post_message: "Falhou ao publicar a mensagem!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Não há mais publicações."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
-      at_least_one_aspect: "Tem de publicar para pelo menos um aspecto"
-      limited: "Limitado - a sua publicação só será vista pelas pessoas com as quais a está partilhar"
-      public: "Público - A sua publicação vai ser visível para todos e encontrada por motores de busca"
+      at_least_one_aspect: "Tem de publicar em pelo menos um aspecto"
+      limited: "Limitado - a sua publicação só será vista pelas pessoas com as quais está partilhar"
+      public: "Público - A sua publicação será visível para todos e encontrada por motores de busca"
     reshares: 
       duplicate: "Já republicou essa publicação!"
     search_for: "Procurar por {{name}}"
     show_more: "mostrar mais"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "um dia"
       days: "%d dias"
@@ -53,7 +64,7 @@ pt-PT:
       year: "cerca de um ano"
       years: "%d anos"
     videos: 
-      unknown: "Tipo de vídeo desconhecido"
-      watch: "Assista a este vídeo em {{provider}}"
+      unknown: "Formato de vídeo desconhecido"
+      watch: "Visualize este vídeo no {{provider}}"
     web_sockets: 
       disconnected: "A websocket está fechada; as publicações não serão distribuídas em directo."
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index d796bd9c6..2ac75b37b 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -9,6 +9,8 @@ ro:
       add_to_aspect: "Adaugă la aspect"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "În {{count}} aspecte"
         many: "În {{count}} aspecte"
@@ -26,8 +28,15 @@ ro:
     confirm_dialog: "Sunteţi sigur?"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Nu mai sunt posturi."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Trebuie sa publici pe cel puţin un aspect"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ ro:
       duplicate: "You've already reshared that post!"
     search_for: "Caută {{name}}"
     show_more: "show more"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "o zi"
       days: "%d zile"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 9ce6f7109..df8634ea1 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -9,6 +9,8 @@ ru:
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
       select_aspects: "Выбрать аспекты"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "В {{count}} аспектах"
         many: "В {{count}} аспектах"
@@ -26,8 +28,15 @@ ru:
     confirm_dialog: "Вы уверены? "
     failed_to_like: "Не удалось!"
     failed_to_post_message: "Не удалось отправить сообщение!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Сообщений больше нет."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
       limited: "Ограниченная - ваша запись будет видна только указанным вами людям"
@@ -36,6 +45,8 @@ ru:
       duplicate: "Вы уже поделились этой записью!"
     search_for: "Искать {{name}}"
     show_more: "показать больше"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "день"
       days: "%d дней[-я]"
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index 623fc87ce..d5f2f5b6b 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -9,6 +9,8 @@ sk:
       add_to_aspect: "Pridať kontakt"
       all_aspects: "Všetky kategórie"
       select_aspects: "Vyberte si kategórie"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "V(o) {{count}} kategóriách"
         many: "V(o) {{count}} kategóriách"
@@ -26,8 +28,15 @@ sk:
     confirm_dialog: "Ste si istý?"
     failed_to_like: "Nepodarilo sa označiť, že sa vám to páči!"
     failed_to_post_message: "Správu sa nepodarilo poslať!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Žiadne ďalšie príspevky."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Musíte publikovať aspoň jednu kategóriu"
       limited: "Obmedzené - váš príspevok uvidia len ľudia, s ktorými sa oň podelíte"
@@ -36,6 +45,8 @@ sk:
       duplicate: "O tento príspevok ste sa už raz znova podelili!"
     search_for: "Hľadať {{name}}"
     show_more: "Zobraziť viac"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "včera"
       days: "%d dňami"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index c2c41b1d0..a59543aef 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -9,6 +9,8 @@ sv:
       add_to_aspect: "Lägg till kontakt"
       all_aspects: "Alla aspekter"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "I {{count}} aspekter"
         many: "I {{count}} aspekter"
@@ -26,8 +28,15 @@ sv:
     confirm_dialog: "Är du säker?"
     failed_to_like: "Misslyckades med att gilla!"
     failed_to_post_message: "Misslyckades att posta meddelande!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Inga fler inlägg."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Du måste publicera till minst en aspekt."
       limited: "Begränsad - ditt inlägg visas endast för personer som du delar med"
@@ -36,6 +45,8 @@ sv:
       duplicate: "You've already reshared that post!"
     search_for: "Sök efter {{name}}"
     show_more: "visa mer"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "en dag"
       days: "%d dagar"
diff --git a/config/locales/javascript/javascript.tr.yml b/config/locales/javascript/javascript.tr.yml
index 32a68d996..dcb1dff9f 100644
--- a/config/locales/javascript/javascript.tr.yml
+++ b/config/locales/javascript/javascript.tr.yml
@@ -8,14 +8,16 @@ tr:
     aspect_dropdown: 
       add_to_aspect: "Yönüne ekle"
       all_aspects: "Tüm yönler"
-      select_aspects: "Select aspects"
+      select_aspects: "Yönleri seç"
+      started_sharing_with: "{{name}} sizinle paylaşıma başladı!"
+      stopped_sharing_with: "{{name}} sizinle paylaşımı durdurdu."
       toggle: 
         few: "{{count}} yön"
         many: "{{count}} yön"
         one: "{{count}} yön"
         other: "{{count}} yön"
         two: "{{count}} yön"
-        zero: "Yönüne ekle"
+        zero: "Yön seç"
     aspect_navigation: 
       deselect_all: "Tümünü kaldır"
       no_aspects: "Hiç yön seçilmedi"
@@ -26,16 +28,25 @@ tr:
     confirm_dialog: "Emin misiniz?"
     failed_to_like: "Beğenme başarısız oldu!"
     failed_to_post_message: "Gönderi başarısız oldu!"
+    getting_started: 
+      alright_ill_wait: "Tamam, ben bekleyeceğim."
+      hey: "Merhaba, {{name}}!"
+      no_tags: "Hey, hiç etiket takip etmiyorsunuz! Gerçekten devam etmek istiyor musun?"
+      preparing_your_stream: "Kişiselleştirilmiş akışınız hazırlanıyor ..."
     infinite_scroll: 
       no_more: "Daha fazla gönderi yok."
+    photo_uploader: 
+      looking_good: "OMG, harika görünüyorsun!"
     publisher: 
       at_least_one_aspect: "En az bir yönünün yayınlanması zorunludur"
       limited: "Sınırlı - gönderi sadece paylaşılan kişiler tarafından görünür"
       public: "Genel - gönderi herkes tarafından görünür ve arama motorları tarafından bulunur olacak"
     reshares: 
-      duplicate: "Zaten bu gönderiyi tekrar paylaştın!"
+      duplicate: "Bu iyi, değil mi? Zaten bu gönderiyi tekrar paylaştın!"
     search_for: "{{name}} Ara"
     show_more: "daha fazlasını göster"
+    tags: 
+      wasnt_that_interesting: "Tamam, benim #{{tagName}} o kadar da ilginç değil..."
     timeago: 
       day: "1 gün"
       days: "%d gün"
diff --git a/config/locales/javascript/javascript.uk.yml b/config/locales/javascript/javascript.uk.yml
index 82f765be8..153a4b0b5 100644
--- a/config/locales/javascript/javascript.uk.yml
+++ b/config/locales/javascript/javascript.uk.yml
@@ -9,6 +9,8 @@ uk:
       add_to_aspect: "Додати контакт"
       all_aspects: "Усі аспекти"
       select_aspects: "Вибрати аспекти"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "У {{count}} аспектах"
         many: "У {{count}} аспектах"
@@ -26,8 +28,15 @@ uk:
     confirm_dialog: "Ви упевнені?"
     failed_to_like: "Не вдалося!"
     failed_to_post_message: "Не вдалося відправити повідомлення!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "Повідомлень більше немає."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "Вам потрібно створити мінімум один аспект"
       limited: "Обмежена - ваш запис буде видний тільки вказаним вами людям"
@@ -36,6 +45,8 @@ uk:
       duplicate: "Ви вже поділилися цим записом!"
     search_for: "Шукати {{name}}"
     show_more: "показати більше"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "день"
       days: "%d днів[-я]"
diff --git a/config/locales/javascript/javascript.zh-CN.yml b/config/locales/javascript/javascript.zh-CN.yml
index bd2fa2502..bb608c4fb 100644
--- a/config/locales/javascript/javascript.zh-CN.yml
+++ b/config/locales/javascript/javascript.zh-CN.yml
@@ -9,6 +9,8 @@ zh-CN:
       add_to_aspect: "添加到视图"
       all_aspects: "All aspects"
       select_aspects: "Select aspects"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "在{{count}}个视图中"
         many: "在{{count}}个视图中"
@@ -26,8 +28,15 @@ zh-CN:
     confirm_dialog: "你确定吗？"
     failed_to_like: "表示喜欢失败！"
     failed_to_post_message: "发布消息失败！"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "没有更多的内容了。"
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "发布时请选择至少一个情景"
       limited: "Limited - your post will only be seen by people you are sharing with"
@@ -36,6 +45,8 @@ zh-CN:
       duplicate: "You've already reshared that post!"
     search_for: "搜索 {{name}}"
     show_more: "查看更多"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "1天"
       days: "%d天"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 8373b0adb..5f6715b32 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -9,6 +9,8 @@ zh-TW:
       add_to_aspect: "加聯絡人"
       all_aspects: "所有面向"
       select_aspects: "選面向"
+      started_sharing_with: "You have started sharing with {{name}}!"
+      stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
         few: "在{{count}}個面向中"
         many: "在{{count}}個面向中"
@@ -26,8 +28,15 @@ zh-TW:
     confirm_dialog: "你確定嗎?"
     failed_to_like: "說讚失敗!"
     failed_to_post_message: "貼文失敗!"
+    getting_started: 
+      alright_ill_wait: "Alright, I'll wait."
+      hey: "Hey, {{name}}!"
+      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
+      preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll: 
       no_more: "沒有貼文了."
+    photo_uploader: 
+      looking_good: "OMG, you look awesome!"
     publisher: 
       at_least_one_aspect: "發表時請至少選擇一個面向"
       limited: "限制 - 只有你想分享的人才看得到你的貼文"
@@ -36,6 +45,8 @@ zh-TW:
       duplicate: "你已經轉貼過該篇貼文了!"
     search_for: "搜尋 {{name}}"
     show_more: "顯示更多"
+    tags: 
+      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
       day: "一天"
       days: "%d天"