updated 98 locale files [ci skip]

98 files changed, 1776 insertions, 461 deletions

diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 7d20a626b..b0f5ba79c 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -30,9 +30,33 @@ ar:
       hello: "مرحبا %{email}!"
       invitation_instructions: 
         accept: "إقبل الدعوة"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "رجاء تجاهل هذا البريد الإلكتروني في حال لم ترغب بقبول الدعوة"
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "لن يتم إنشاء حسابك حتى تلج الرابط أعلاه وتسجل"
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "تم دعوتك للإنضمام لدياسبرا"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: ", %{url}, يمكنك قبولها عبر الرابط التالي"
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index b156b02ac..50774f2e2 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -30,9 +30,33 @@ bg:
       hello: "Здравейте %{email}!"
       invitation_instructions: 
         accept: "Приемане на поканата"
+        arrived: "Социалната мрежа, която сте очаквали е вече реалност. Подобрена, по-сигурна и развлекателна, %{strong_diaspora} е насреща когато желаете да споделяте и изследвате мрежата по нов начин."
+        be_yourself: "Бъдете себе си"
+        be_yourself_paragraph: "Internet предоставя уникални възможности за изразяване. %{strong_diaspora} ви позволява да бъдете себе си и да споделяте както желаете, с когото пожелаете, ползвайки или не името си."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Съдържанието не се визуализира правилно? %{link} във вашия браузър"
+        email_address: "questions@joindiaspora.com"
+        email_us: "За общи запитвания и поддръжка на вашия акаунт в Diaspora моля пишете ни на %{email}."
+        finally: "Най-накрая е тук"
+        friends_saying: "Какво казват приятелите ви..."
+        get_connected: "Свържете се"
+        get_connected_paragraph: "Международно движение със споделена визия за по-добра мрежа, първата черта на %{strong_diaspora} е общността. Срещнете нови хора, свържете се с приятели и се включете в забавата."
+        have_fun: "Забавлявайте се"
+        have_fun_paragraph: "%{strong_diaspora} е е посветена на откриването на ново съдържание и хора. %{link} първото приложение за %{strong_diaspora} е само началото. Събирайте и споделяйте мрежата в целия ѝ блясък."
+        help_fund: "помогнете за финансирането на Diaspora"
+        here: "тук"
         ignore: "Ако не желаете да приемете поканата, моля игнорирайте писмото."
+        join_team: "Присъединете се към нашия отбор"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} е създадена от хора, които обичат Internet. %{jointeam} или %{helpfund}!"
+        more_people: "Дори повече са развълнувани да ви видят в Diaspora!"
         no_account_till: "Акаунтът няма да бъде създаден докато не посетите горната връзката и се регистрирате."
+        or: "или"
+        sign_up_now: "Регистрирайте се сега →"
         subject: "Поканени сте да се присъедините към Diaspora!"
+        team_diaspora: "Екипът на Diaspora"
+        unsubscribe: "За да прекратите абонамента кликнете %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "от %{url}, можете да приемете чрез връзката по-долу в писмото."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml
index 37e7526d6..d2a1f57c5 100644
--- a/config/locales/devise/devise.br.yml
+++ b/config/locales/devise/devise.br.yml
@@ -30,9 +30,33 @@ br:
       hello: "Demat, %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 200701c53..55546aeae 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -30,9 +30,33 @@ cs:
       hello: "Zdravím %{email}!"
       invitation_instructions: 
         accept: "Přijmout pozvání"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Pokud nechcete přijmout pozvání, prosím ignorujte tento e-mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Váš účet nebude vytvořen dokud nepřistoupíte na uvedený odkaz a zaregistrujete se."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Byli jste pozváni na Diasporu!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 86b1254e8..40eb858cb 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -8,7 +8,7 @@ cy:
     confirmations: 
       confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
+        resend_confirmation: "Anfon eto cyfarwyddiadau am sut i gadarnhau eich cyfrif"
       send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
     failure: 
       inactive: "Nid yw eich cyfrif wedi'i actifadu."
@@ -27,18 +27,42 @@ cy:
         confirm: "Confirm my account"
         subject: "Cyfarwyddiadau Cadarnhad"
         you_can_confirm: "You can confirm your account through the link below:"
-      hello: "Hello %{email}!"
+      hello: "Helo %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
         have_invited_you: "%{names} have invited you to join Diaspora"
       reset_password_instructions: 
-        change: "Change my password"
+        change: "Newid y cyfrinair"
         ignore: "If you didn't request this, please ignore this email."
         someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
         subject: "Reset password instructions"
@@ -51,7 +75,7 @@ cy:
       welcome: "Croeso %{email}!"
     passwords: 
       edit: 
-        change_password: "Change my password"
+        change_password: "Newid fy nghyfrinair"
       new: 
         forgot_password: "Wedi anghofio eich cyfrinair?"
         no_account: "Dim cyfrif gyda e-bost hwn yn bodoli. Os ydych yn aros am wahodd, rhaid i chi aros hwyrach bach..."
@@ -70,7 +94,7 @@ cy:
         login: "Mewngofnodi"
         modern_browsers: "only supports modern browsers."
         password: "Cyfrinair"
-        remember_me: "Remember me"
+        remember_me: "Cofiwch mi"
         sign_in: "Mewngofnodi"
         username: "Enw Defnyddiwr"
       signed_in: "Arwyddwyd i fewn yn llwyddiannus."
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index 7bb88ce2d..be86cd0ae 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -30,9 +30,33 @@ da:
       hello: "Hej %{email}!"
       invitation_instructions: 
         accept: "Accepter invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Hvis du ikke vil acceptere invitationen skal du blot ignorere denne mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Din konto vil ikke blive oprettet før du har klikket ind på ovenstående link, og skriver dig op."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Du er blevet inviteret til at bruge Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "på %{url}, du kan acceptere ved at følge linket nedenunder."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 6d77d48f5..cb76a4a89 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -30,9 +30,33 @@ de:
       hello: "Hallo %{email}!"
       invitation_instructions: 
         accept: "Einladung annehmen"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Wenn du die Einladung nicht annehmen möchtest, ignoriere diese E-Mail einfach."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Dein Konto wird nicht erstellt solange du dich nicht über den oberen Link registrierst."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Du wurdest zu Diaspora eingeladen!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "unter %{url}, kannst du sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.de_formal.yml b/config/locales/devise/devise.de_formal.yml
index 4aede37a8..3623d3eaa 100644
--- a/config/locales/devise/devise.de_formal.yml
+++ b/config/locales/devise/devise.de_formal.yml
@@ -30,9 +30,33 @@ de_formal:
       hello: "Hallo %{email}!"
       invitation_instructions: 
         accept: "Einladung annehmen"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Wenn Sie die Einladung nicht annehmen möchten, ignorieren Sie diese E-Mail einfach."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Ihr Konto wird nicht erstellt solange Sie sich nicht über den oberen Link registrieren."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Sie wurden zu Diaspora eingeladen!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "unter %{url}, können Sie sie über den untenstehenden Link akzeptieren."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 087f56598..d50bde8d9 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -30,9 +30,33 @@ el:
       hello: "Γειά σου %{email}!"
       invitation_instructions: 
         accept: "Αποδοχή πρόσκλησης"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Εάν δεν θέλετε να αποδεχτείτε την πρόσκληση, παρακαλώ αγνοήστε αυτό το email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Ο λογαριασμός σας δεν θα δημιουργηθεί μέχρι να μεταβείτε στον παρακάτω σύνδεσμο και συνδεθείτε. "
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Έχετε προσκληθεί να συμμετάσχετε στο Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "στο %{url}, μπορείτε να το αποδεχτείτε μέσω του παρακάτω συνδέσμου."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.en_1337.yml b/config/locales/devise/devise.en_1337.yml
index ffd2172da..650b83c54 100644
--- a/config/locales/devise/devise.en_1337.yml
+++ b/config/locales/devise/devise.en_1337.yml
@@ -30,9 +30,33 @@ en_1337:
       hello: "H3Y %{email}!"
       invitation_instructions: 
         accept: "J01N!"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "1M 4 N00B!"
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "51GN UP -> L1NK!"
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "U H4V3 B33N 1NV173D 70 D*!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "@ %{url}, U C4N 4CC3P7 17 -> L1NK!"
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.en_pirate.yml b/config/locales/devise/devise.en_pirate.yml
index ff34a0fee..c0b790bee 100644
--- a/config/locales/devise/devise.en_pirate.yml
+++ b/config/locales/devise/devise.en_pirate.yml
@@ -30,9 +30,33 @@ en_pirate:
       hello: "Hello %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index 85154fbc6..c51d42c2d 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -30,9 +30,33 @@ en_shaw:
       hello: "𐑣𐑧𐑤𐑴 %{email}!"
       invitation_instructions: 
         accept: "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑴𐑯𐑑 𐑚𐑰 𐑒𐑮𐑦𐑱𐑑𐑩𐑛 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑕𐑲𐑯 𐑳𐑐."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "𐑿𐑝 𐑚𐑧𐑯 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index f88334e34..0eccff254 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -30,9 +30,33 @@ eo:
       hello: "Saluton, %{email}!"
       invitation_instructions: 
         accept: "Akcepti inviton"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Se vi ne volas akcepti la inviton, bonvoli ignori tiun ĉi retpoŝton"
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Via konto ne kreiĝos ĝis vi eniros la supre ligilon kaj registiĝos."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Vi invitigitas aniĝi al DIASPORA*!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "ĉe %{url}, vi povas akcepti ĝin per la posta ligilo."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.es-AR.yml b/config/locales/devise/devise.es-AR.yml
index d0590a0f5..482cb2c57 100644
--- a/config/locales/devise/devise.es-AR.yml
+++ b/config/locales/devise/devise.es-AR.yml
@@ -30,9 +30,33 @@ es-AR:
       hello: "¡Hola %{email}!"
       invitation_instructions: 
         accept: "Aceptar la invitación"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Si no querés aceptar la invitación, por favor ignorá este correo."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Tu cuenta no será creada hasta que accedas al anterior enlace y te registres."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "¡Te invitaron a unirte a Diáspora*!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "en %{url}, podes aceptarlo desde el link  de abajo "
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index caf51359d..4e8783f8c 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -30,9 +30,33 @@ es-CL:
       hello: "Hola %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index f365986fc..a6d2d4e94 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -21,7 +21,7 @@ es:
     invitations: 
       invitation_token_invalid: "¡El identificador de la invitación no es valido!"
       send_instructions: "Tu invitación se ha enviado."
-      updated: "Tu contraseña ha sido configurada correctamente. Ahora estás conectado."
+      updated: "Tu contraseña ha sido establecida con éxito. Ahora has accedido."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmar mi cuenta"
@@ -30,9 +30,33 @@ es:
       hello: "Hola %{email}!"
       invitation_instructions: 
         accept: "Aceptar invitación"
+        arrived: "La red social que has estado esperando ha llegado. Renovada, más segura y más divertida, %{strong_diaspora} está lista para ayudarte a compartir y explorar la web de una forma totalmente nueva."
+        be_yourself: "Se tú mismo"
+        be_yourself_paragraph: "Internet ha creado nuevas formas únicas para que nos expresemos. %{strong_diaspora} te permite ser tú mismo y compartir lo que le apetezca, usando tu nombre real o no."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "¿No se muestra correctamente el email? %{Link} en su navegador"
+        email_address: "questions@joindiaspora.com"
+        email_us: "Para consultas generales o soporte sobre tu cuenta de Diaspora*, por favor envíanos un correo a %{email}."
+        finally: "Finalmente - ya está aquí"
+        friends_saying: "Lo que tus amigos están diciendo..."
+        get_connected: "Conéctate"
+        get_connected_paragraph: "Un movimiento internacional con una visión compartida para una red mejor, la primera característica de %{strong_diaspora} es su comunidad. Conocer gente nueva, conectarse con amigos y unirse a la diversión."
+        have_fun: "Que te diviertas"
+        have_fun_paragraph: "%{strong_diaspora} se trata de descubrir contenido nuevo y sorprendente de personas conectadas.%{Link}, la primera aplicación mundial de %{strong_diaspora} es sólo el principio. Recopila y comparte en la red en todo su explendor."
+        help_fund: "ayuda a financiar Diaspora*"
+        here: "aquí"
         ignore: "Si no quieres aceptar la invitación, ignora este email."
+        join_team: "Únete a nuestro equipo"
+        love: "Saludos,"
+        made_by_people: "%{strong_diaspora} está hecha por personas que aman Internet tanto como tú. %{jointeam} o %{helpfund}!"
+        more_people: "¡Incluso hay más personas que están esperando verte!"
         no_account_till: "Tu cuenta no será creada hasta que no accedas al enlace superior para registrarte."
+        or: "o"
+        sign_up_now: "Regístrate ahora →"
         subject: "¡Has sido invitado a unirte a Diaspora*!"
+        team_diaspora: "Equipo de Diaspora*"
+        unsubscribe: "Para anular tu suscripción por favor haz clic en %{link}."
+        view_in: "Ver en"
       inviter: 
         accept_at: "en %{url}, puedes aceptar en el enlace inferior."
         has_invited_you: "%{name}"
@@ -60,8 +84,8 @@ es:
       updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
     registrations: 
       destroyed: "¡Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
-      signed_up: "Te has registrado correctamente. Consulta el mensaje de confirmación que te hemos enviado a tu correo."
-      updated: "Has actualizado tu cuenta correctamente."
+      signed_up: "Te has registrado con éxito. Un mensaje de confirmación ha sido enviada a tu email."
+      updated: "Has actualizado tu cuenta con éxito."
     sessions: 
       new: 
         alpha_software: "Estás a punto de utilizar software en versión alpha."
@@ -73,8 +97,8 @@ es:
         remember_me: "Recordarme"
         sign_in: "Acceder"
         username: "Nombre de usuario"
-      signed_in: "Has ingresado correctamente."
-      signed_out: "Has salido correctamente."
+      signed_in: "Accediste con éxito."
+      signed_out: "Saliste con éxito."
     shared: 
       links: 
         forgot_your_password: "¿Olvidaste tu contraseña?"
diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index a60ebacbb..c563dcc37 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -30,9 +30,33 @@ eu:
       hello: "Kaixo %{email}!"
       invitation_instructions: 
         accept: "Gonbidapena"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Ez baduzu gonbidapena onartu nahi, mesedez egin iezaiozu ez-ikusi mezu honi."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Zure kontua ez da sortuko hemengo esteka jarraitu eta izena eman arte."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Diasporara batzera gonbidatua izan zara!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "%{url}(e)n, onartu dezakezu beheko esteka jarraituz."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 85a534e50..a0fbb5cb2 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -30,9 +30,33 @@ fi:
       hello: "Hei, %{email}!"
       invitation_instructions: 
         accept: "Hyväksy kutsu"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Mikäli et halua hyväksyä kutsua, voit jättää tämän viestin huomioimatta."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. "
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Sinut on kutsuttu käyttämään Diasporaa!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "osoitteessa %{url}, hyväksyminen alla olevasta linkistä."
         has_invited_you: "%{names}"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 4760e9935..a092dc004 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -30,9 +30,33 @@ fr:
       hello: "Bonjour %{email} !"
       invitation_instructions: 
         accept: "Accepter l'invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Si vous ne voulez pas accepter l'invitation, merci d'ignorer ce courriel."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Votre compte ne sera créé que lorsque vous irez sur le lien ci-dessus et que vous vous inscrirez."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Vous avez été invité à rejoindre Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml
index 4366b8c1c..2c6ab535a 100644
--- a/config/locales/devise/devise.ga.yml
+++ b/config/locales/devise/devise.ga.yml
@@ -30,9 +30,33 @@ ga:
       hello: "Haileo %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index ed83e7f29..b693492af 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -30,9 +30,33 @@ he:
       hello: "שלום %{email}!"
       invitation_instructions: 
         accept: "אשר הזמנה"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "אם אין ברצונך לאשר את ההזמנה, ניתן להתעלם מהודעה זו."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: " החשבון שלך לא ייווצר עד לכניסתך לקישור המופיע למעלה וההרשמה לשירות."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "הוזמנת להצטרף לדיאספורה!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "בכתובת %{url}, באפשרותך לקבל זאת באמצעות הקישור שלהלן."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 104b35f08..2dd7d2d5a 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -30,9 +30,33 @@ hu:
       hello: "Szia %{email}!"
       invitation_instructions: 
         accept: "Elfogadom a meghívót"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Ha nem szeretnél csatlakozni csak hagyd figyelmen kívül ezt a levelet."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "A fiókod addig nem készül el amíg be nem lépsz a megadott linkkel és be nem regisztrálsz."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálóhoz."
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "Meghívás elfogadása: %{url}"
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index d64b27ab8..b550e3476 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -30,9 +30,33 @@ id:
       hello: "Halo %{email}!"
       invitation_instructions: 
         accept: "Setuju menerima undangan"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Mohon abaikan e-mail ini, jika anda tidak setuju untuk menerima undangan ini."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Akun anda tidak akan diciptakan sampai anda mengakses tautan di atas dan mendaftar."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Anda telah diundang untuk bergabung di Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "di %{url}, anda dapat menerimanya melalui tautan di bawah ini."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 075a4be06..0073261c0 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -30,9 +30,33 @@ is:
       hello: "Halló %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index f4fdd765e..14fead06d 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -30,9 +30,33 @@ it:
       hello: "Ciao %{email}!"
       invitation_instructions: 
         accept: "Accetta l'invito"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Se non vuoi accettare l'invito, per favore ignora questa email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Il tuo account non sarà creato finché non cliccherai sul link qua sopra ed effettuerai la registrazione."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Hai un invito per iscriverti a Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "su %{url}, puoi accettare dal link qua sotto."
         has_invited_you: "%{name} ti ha invitato ad entrare in Diaspora"
diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml
index bf987d51c..c475b1d2c 100644
--- a/config/locales/devise/devise.ja.yml
+++ b/config/locales/devise/devise.ja.yml
@@ -30,9 +30,33 @@ ja:
       hello: "%{email}さん、こんにちは！"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 1937f394c..814f61686 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -30,9 +30,33 @@ ko:
       hello: "%{email} 님 환영합니다!"
       invitation_instructions: 
         accept: "초대 수락하기"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "초대를 수락하지 않으려면 이 메일을 무시하세요."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "계정은 가입하지 않는 한 만들어지지 않습니다."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "디아스포라로 초대합니다!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "%{URL}에서, 아래의 링크를 통해 확인할 수 있습니다."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 16794c5c9..65a37b483 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -30,9 +30,33 @@ lt:
       hello: "Labas, %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index 28df06285..905f2aa85 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -30,9 +30,33 @@ mk:
       hello: "Здраво %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index ebec54f17..c5e1decd0 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -30,9 +30,33 @@ nb:
       hello: "Hei %{email}!"
       invitation_instructions: 
         accept: "Takk ja til invitasjonen"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Hvis du ikke ønsker å godta invitasjonen, kan du se bort fra denne e-posten."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Brukeren din vil ikke opprettes før du besøker lenken over og registrerer deg."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Du har blitt invitert til Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 3928d8965..5db300103 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -30,9 +30,33 @@ nl:
       hello: "Hallo %{email}!"
       invitation_instructions: 
         accept: "Accepteer uitnodiging"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Als je de uitnodiging niet wilt accepteren, negeer dan deze E-mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Je account wordt niet aangemaakt totdat je de bovenstaande link bezoekt en je aanmeldt."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Je bent uitgenodigd om lid te worden van Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "op %{url}, je kunt deze accepteren via onderstaande link."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.nn.yml b/config/locales/devise/devise.nn.yml
index 96a1343df..d30380525 100644
--- a/config/locales/devise/devise.nn.yml
+++ b/config/locales/devise/devise.nn.yml
@@ -30,9 +30,33 @@ nn:
       hello: "Hei %{email}."
       invitation_instructions: 
         accept: "Godta invitasjonen"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Om du ikkje ønskjer å godta invitasjonen, lèt du berre vera å svara på meldinga."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Kontoen din vil ikkje verta oppretta før du nyttar lenkja ovanfor og loggar deg på."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Du er vorten invitert til å vera med i Diaspora."
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "på %{url}, du kan godta det gjennom lenkja nedanfor."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml
index 27e019440..06a5cc3ed 100644
--- a/config/locales/devise/devise.pa.yml
+++ b/config/locales/devise/devise.pa.yml
@@ -30,9 +30,33 @@ pa:
       hello: "Hello %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 455c123d9..fc1212747 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -30,9 +30,33 @@ pl:
       hello: "Cześć %{email}!"
       invitation_instructions: 
         accept: "Przyjmij zaproszenie"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Bądź sobą"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "E-mail nie wyświetla się poprawnie? Otwórz %{link} w przeglądarce"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Nareszcie - jest tutaj"
+        friends_saying: "Co mówią Twoi znajomi..."
+        get_connected: "Bądź w kontakcie"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Baw się dobrze"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "wspomóż Diasporę darowizną"
+        here: "tutaj"
         ignore: "Zignoruj tę wiadomość jeśli nie chcesz zaakceptować tego zaproszenia."
+        join_team: "Dołącz do naszego zespołu"
+        love: "Pozdrawiam,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Jeszcze więcej osób, nie może się doczekać, aby Cię zobaczyć!"
         no_account_till: "Konto nie zostanie utworzone dopóki nie zalogujesz się na stronie powyżej."
+        or: "lub"
+        sign_up_now: "Zarejestruj się teraz →"
         subject: "Zapraszamy do dołączenia do Diaspory!"
+        team_diaspora: "Zespół Diaspory"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "Wyświetl w"
       inviter: 
         accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 59ec785f1..2ea16a371 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -30,9 +30,33 @@ pt-BR:
       hello: "Oi %{email}!"
       invitation_instructions: 
         accept: "Aceitar convite"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Se você não quer aceitar o convite, por favor ignore este e-mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Sua conta não pode ser criada até que você acesse o link acima e se cadastre."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Você foi convidado(a) para participar em Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "em %{url}, você pode aceitar através do link abaixo."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index 6b615d5b0..1123f8720 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -30,9 +30,33 @@ pt-PT:
       hello: "Olá, %{email}!"
       invitation_instructions: 
         accept: "Aceitar o convite"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Se não deseja aceitar o convite, por favor ignore este email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "A sua conta não será criada até que aceda à hiperligação acima e se registe."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Foi convidado para se juntar ao Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "em %{url}, pode aceitá-lo através da ligação abaixo."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 830d97131..7a4f68a78 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -30,9 +30,33 @@ ro:
       hello: "Bună %{email}!"
       invitation_instructions: 
         accept: "Acceptă invitaţia"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Dacă nu doreşti sa accepţi invitaţia, ignoră acest mesaj."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Contul dvs. nu va fi creat până când nu veţi accesa linkul de mai sus şi vă veţi înscrie."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Un prieten te-a invitat pe Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 8625a9e37..84abe5ba1 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -30,9 +30,33 @@ ru:
       hello: "Привет %{email}!"
       invitation_instructions: 
         accept: "Принять приглашение"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Если вы не хотите принимать приглашение, проигнорируйте."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Ваш аккаунт не будет создан, пока вы не зарегистрировались."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Вы приглашены присоединиться к диаспоре!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "в %{url}, вы можете принять его по ссылке ниже."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index be748020c..9556026de 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -30,9 +30,33 @@ sk:
       hello: "Ahoj, %{email}!"
       invitation_instructions: 
         accept: "Prijať pozvanie"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Ak nechcete prijať toto pozvanie, ignorujte, prosím, tento e-mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Váš účet sa nevytvorí, kým nekliknete na odkaz vyššie a nezaregistrujete sa."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Pozvali vás na Diasporu!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "Kliknutím na odkaz na stránku %{url} ho môžete prijať."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index 377c9f178..d942a62c7 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -30,9 +30,33 @@ sv:
       hello: "Hej %{email}!"
       invitation_instructions: 
         accept: "Acceptera inbjudan"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Om du inte vill acceptera inbjudan, var snäll och ignorera detta mail."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Ditt konto kommer inte att skapas förrän du besöker länken ovan och registrerar dig."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Du har blivit inbjuden att gå med i Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "via %{url}. Du accepterar genom att klicka på länken nedan."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 0ca2484bb..fbcc68469 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -30,9 +30,33 @@ tr:
       hello: "Merhaba %{email}!"
       invitation_instructions: 
         accept: "Daveti kabul et"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Daveti kabul etmek istemiyorsanız, lütfen bu e-postayı gözardı edin."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Hesabınız yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Diaspora'ya katılmak için davet edildiniz!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "%{url}, aşağıdaki bağlantıya tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.uk.yml b/config/locales/devise/devise.uk.yml
index 7d0b122da..e569d4be3 100644
--- a/config/locales/devise/devise.uk.yml
+++ b/config/locales/devise/devise.uk.yml
@@ -30,9 +30,33 @@ uk:
       hello: "Привіт %{email}!"
       invitation_instructions: 
         accept: "Прийняти запрошення"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "Якщо ви не хочете приймати запрошення, проігноруйте."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Ваш аккаунт не буде створений, поки ви не зареєструвалися."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "Ви запрошені приєднатися до Діаспори!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "в %{url}, ви можете прийняти його по посиланню нижче."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.vi.yml b/config/locales/devise/devise.vi.yml
index f7b40ee82..259155cfd 100644
--- a/config/locales/devise/devise.vi.yml
+++ b/config/locales/devise/devise.vi.yml
@@ -30,9 +30,33 @@ vi:
       hello: "Hello %{email}!"
       invitation_instructions: 
         accept: "Accept invitation"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "If you don't want to accept the invitation, please ignore this email."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "Your account won't be created until you access the link above and sign up."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "You've been invited to join Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index 28158a7a5..68ac1b24a 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -30,9 +30,33 @@ zh-CN:
       hello: "您好, %{email}!"
       invitation_instructions: 
         accept: "接收请求"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "如果您不想接收这个邀请，请忽略这封邮件。"
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "只有在您点击上面的链接并注册后，您的帐号才会被创建。"
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "您被邀请加入Diaspora！"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "at %{url}, you can accept it through the link below."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 34957d864..b703d0f65 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -30,9 +30,33 @@ zh-TW:
       hello: "你好, %{email}!"
       invitation_instructions: 
         accept: "接受邀請"
+        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
+        be_yourself: "Be Yourself"
+        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        cubbies: "Cubbi.es"
+        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        email_address: "questions@joindiaspora.com"
+        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
+        finally: "Finally - it's here"
+        friends_saying: "What your friends are saying..."
+        get_connected: "Get Connected"
+        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
+        have_fun: "Have Fun"
+        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
+        help_fund: "help fund Diaspora"
+        here: "here"
         ignore: "如果你不想接受邀請,請不用管這封信."
+        join_team: "Join our Team"
+        love: "Love,"
+        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
+        more_people: "Even more people are excited to see you!"
         no_account_till: "在你按了以上連結並註冊後,你的帳號才會成功開戶."
+        or: "or"
+        sign_up_now: "Sign up now →"
         subject: "有人邀請你加入 Diaspora!"
+        team_diaspora: "Team Diaspora"
+        unsubscribe: "To unsubscribe please click %{link}."
+        view_in: "View in"
       inviter: 
         accept_at: "於 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name}"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 744a787bf..56112cb99 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -105,16 +105,19 @@ ar:
       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_suggestion: "... تملك %{link} اقتراحا؟"
         find_a_bug: "... وجدت %{link}?"
         have_a_question: "... تملك %{link}?"
         here_to_help: "مجتمع دياسبرا متأهب للمساعدة"
         need_help: "تحتاج للمساعدة؟"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "حافظ على %{pod} سريعا عبر تبرع شهري لصيانة السيرفرات "
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "لا أعضاء"
       no_tags: "+ جِـد وسما لمتابعته"
       people_sharing_with_you: "أعضاء يتشاركون معك"
@@ -288,6 +291,7 @@ ar:
       comma_seperated_plz: "يمكن إدخال أكثر من بريد إلكتروني واحد باستعمال علامة التوقف فاصلة, بين كل بريد وآخر"
       if_they_accept_info: "إذا قبلوا دعوتك ، سيتم إضافتهم إلى الفئة التي دعوتهم إليها"
       invite_someone_to_join: "دعوة صديق للإنضمام إلى دياسبرا"
+      language: "Language"
       personal_message: "رسالة شخصية"
       resend: "إعادة إرسال"
       send_an_invitation: "إرسال دعوة"
@@ -731,6 +735,7 @@ ar:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "يَنشُر ..."
       publishing_to: "نشر إلى: "
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 9e93ace09..a9b1f9760 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -105,16 +105,19 @@ bg:
       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}: ръководства, съвети и новини от общността"
+        tutorials_wiki_and_forum: "%{tutorial}, %{wiki} и %{forum}: Ръководства, съвети и новини от общността"
       introduce_yourself: "Това е вашият поток.  Включете се и се представете."
       keep_us_running: "Осигурете бързата работа на %{pod} като дарите пари за месечната издръжка на сървърите!"
+      new_here: 
+        follow: "Следете %{link} и приветствайте новите потребители на Diaspora*!"
+        learn_more: "Научете повече"
+        title: "Поздравете новодошлите"
       no_contacts: "Няма контакти"
       no_tags: "+ Намиране на марки"
       people_sharing_with_you: "Хора споделящи с вас"
@@ -288,6 +291,7 @@ bg:
       comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи."
       if_they_accept_info: "ако приемат поканата ще бъдат добавени към аспекта в който сте ги поканили."
       invite_someone_to_join: "Поканете някой в Diaspora!"
+      language: "Език"
       personal_message: "Лично съобщение"
       resend: "Повторно изпращане"
       send_an_invitation: "Изпращане на поканата"
@@ -731,6 +735,7 @@ bg:
       new_user_prefill: 
         hello: "Привет на всички, аз съм #%{new_user_tag}."
         i_like: "Интересува ме %{tags}."
+        invited_by: "Благодаря за поканата, "
       post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
       posting: "Публикуване..."
       publishing_to: "публикуване в: "
@@ -801,8 +806,8 @@ bg:
       failure: "Не започнахте да следите \"#%{name}\". Да не би вече да следите марката?"
       success: "Ура! Започнахте да следите \"#%{name}\"."
     destroy: 
-      failure: "Следенето на \"#%{name}\" не е прекратено"
-      success: "Следенето на \"#%{name}\" е прекратено"
+      failure: "Следенето на \"#%{name}\" не е прекратено."
+      success: "Следенето на \"#%{name}\" е прекратено."
   tags: 
     show: 
       follow: "Следете #%{tag}"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 979402c34..c752f7775 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -105,16 +105,19 @@ br:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Darempred ebet"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ br:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Kas en dro"
       send_an_invitation: "Kas ur bedadenn"
@@ -731,6 +735,7 @@ br:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Skrivañ ur c'hemennad da %{aspect}"
       posting: "Oc'h embann..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 41bbd8fc3..b733a3829 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -61,9 +61,9 @@ cs:
       done_editing: "ukončit úpravy"
     aspect_listings: 
       add_an_aspect: "+ Přidat aspekt"
-      deselect_all: "Deselect all"
+      deselect_all: "Zrušit výběr"
       edit_aspect: "Upravit %{name}"
-      select_all: "Select all"
+      select_all: "Vybrat vše"
     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."
@@ -105,16 +105,19 @@ cs:
       help: 
         do_you: "Do you:"
         email_feedback: "Můžete také poslat %{link}."
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
         feature_suggestion: "... vymyslel jste novou %{link}?"
         find_a_bug: "... našli jste %{link}?"
         have_a_question: "... máte nějakou %{link}?"
         here_to_help: "Komunita Diaspory je tu!"
         need_help: "Potřebujete pomoct?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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."
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       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í"
@@ -286,8 +289,9 @@ cs:
       already_invited: "Následující lidé nepřijali vaše pozvání:"
       aspect: "Aspekt"
       comma_seperated_plz: "Můžete zadat více e-mailových adres oddělených čárkami."
-      if_they_accept_info: "pokud přijmou, budou přidáni do aspektu, do kterého byly pozváni."
+      if_they_accept_info: "pokud bude pozvání přijato, kontak bude přidán do aspektu, do kterého byl pozván."
       invite_someone_to_join: "Pozvěte někoho na Diasporu!"
+      language: "Jazyk"
       personal_message: "Osobní zpráva"
       resend: "Znovu odeslat"
       send_an_invitation: "Odeslat pozvánku"
@@ -474,7 +478,7 @@ cs:
       add_contact_from_tag: "přidat kontakt ze štítku"
     aspect_list: 
       edit_membership: "upravit člena aspektu"
-    few: "%{count} lidi"
+    few: "%{count} lidmi"
     helper: 
       people_on_pod_are_aware_of: " lidé na podu jsou si vědomi"
       results_for: " výsledky pro %{params}"
@@ -483,9 +487,9 @@ cs:
       no_one_found: "... a nikdo nebyl nalezen."
       no_results: "Hej! Musíte něco hledat."
       results_for: "výsledky hledání"
-    many: "%{count} lidí"
-    one: "1 osoba"
-    other: "%{count} lidí"
+    many: "%{count} lidmi"
+    one: "1 člověkem"
+    other: "%{count} lidmi"
     person: 
       add_contact: "přidat kontakt"
       already_connected: "Již připojen"
@@ -517,10 +521,10 @@ cs:
       add_some: "přidat nějaké"
       edit: "upravit"
       you_have_no_tags: "nemáš žádný štítek!"
-    two: "%{count} lidé"
+    two: "%{count} lidmi"
     webfinger: 
       fail: "Omlouváme se, ale %{handle} nebyl nalezen."
-    zero: "žádní lidé"
+    zero: "nikým"
   photos: 
     comment_email_subject: "%{name}'s photo"
     create: 
@@ -731,6 +735,7 @@ cs:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
       publishing_to: "publikování na:"
@@ -771,16 +776,16 @@ cs:
     show_more_comments: "Zobrazit %{number} dalších komentářů"
   streams: 
     aspects: 
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
+      title: "Vaše aspekty"
+    aspects_stream: "Aspekty"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      add_a_tag: "Add a tag"
+      add_a_tag: "Přidat štítek"
       contacts_title: "People who dig these tags"
       follow: "Follow"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
+      title: "#Sledované štítky"
+    followed_tags_stream: "#Sledované štítky"
     mentioned_stream: "@Mentions"
     mentions: 
       contacts_title: "People who mentioned you"
@@ -806,7 +811,7 @@ cs:
   tags: 
     show: 
       follow: "Sledovat #%{tag}"
-      followed_by: "followed by"
+      followed_by: "sledováno"
       following: "Sledujete #%{tag}"
       nobody_talking: "Nikdo dosud nemluví o %{tag}."
       people_tagged_with: "Lidé označení %{tag}"
@@ -887,7 +892,7 @@ cs:
       password_changed: "Heslo bylo změněno. Nyní se můžete přihlásit s vaším novým heslem."
       password_not_changed: "Změna hesla selhala"
       settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_updated: "Nastavení uloženo"
       unconfirmed_email_changed: "E-mail změněn. Vyžaduje aktivaci."
       unconfirmed_email_not_changed: "Změna e-mailu selhala"
   webfinger: 
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index c47eb00e1..0de1fefda 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -29,7 +29,7 @@ cy:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "You've already reshared that post!"
+              taken: "Mae hynny'n dda, huh? Rydych chi wedi ailrhannu eisoes y swydd honno!"
         user: 
           attributes: 
             email: 
@@ -40,7 +40,7 @@ cy:
               invalid: "is invalid. We only allow letters, numbers, and underscores"
               taken: "is already taken."
   ago: "%{time} ago"
-  all_aspects: "All aspects"
+  all_aspects: "Agweddau i gŷd"
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALPHA"
@@ -70,7 +70,7 @@ cy:
     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: 
-      failure: "Aspect creation failed."
+      failure: "Creu Aspect wedi methu."
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       failure: "%{name} is not empty and could not be removed."
@@ -82,40 +82,43 @@ cy:
       confirm_remove_aspect: "A ydych yn siŵr eich bod am ddileu yr agwedd hon?"
       done: "Done"
       make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
+      remove_aspect: "Dileu yr agwedd hwn"
       rename: "rename"
       update: "update"
       updating: "updating"
-    few: "%{count} aspects"
+    few: "%{count} agweddau"
     helper: 
       are_you_sure: "A ydych yn siŵr eich bod am ddileu yr agwedd hon?"
-      aspect_not_empty: "Aspect not empty"
+      aspect_not_empty: "Aspect nid ar wag"
       remove: "remove"
     index: 
       cubbies: 
         explanation: "Cubbi.es is the first Diaspora application under development."
-        heading: "Connect to Cubbi.es"
+        heading: "Cysylltu i Cubbi.es"
         learn_more: "Learn more"
       diaspora_id: 
         content_1: "Your Diaspora ID is:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
-        heading: "Diaspora ID"
+        heading: "ID Diaspora"
       donate: "Donate"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       help: 
-        do_you: "Do you:"
+        do_you: "Ydych chi:"
         email_feedback: "%{link} your feedback, if you prefer"
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
         feature_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
-        have_a_question: "... have a %{link}?"
+        have_a_question: "... yn cael cwestion %{link}?"
         here_to_help: "Diaspora community is here to help!"
-        need_help: "Need Help?"
+        need_help: "Oes rhaid help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
+      no_contacts: "Dim cysylltiadau"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
@@ -124,12 +127,12 @@ cy:
         heading: "Connect Services"
       unfollow_tag: "Stop following #%{tag}"
       welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
-      your_aspects: "Your Aspects"
-    many: "%{count} aspects"
+      your_aspects: "Eich Agweddau"
+    many: "%{count} agweddau"
     move_contact: 
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      success: "Unigolyn wedi symud i agwedd newydd"
     new: 
       create: "Create"
       name: "Name"
@@ -141,7 +144,7 @@ cy:
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
-    other: "%{count} aspects"
+    other: "%{count} agweddau"
     seed: 
       acquaintances: "Acquaintances"
       family: "Family"
@@ -154,11 +157,11 @@ cy:
       view_all_contacts: "View all contacts"
     show: 
       edit_aspect: "edit aspect"
-    two: "%{count} aspects"
+    two: "%{count} agweddau"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
       success: "Eich aspect, %{name},  wedi bod yn golygu yn llwyddiannus."
-    zero: "no aspects"
+    zero: "dim agweddau"
   authorizations: 
     index: 
       no_applications: "You haven't registered any applications yet."
@@ -194,7 +197,7 @@ cy:
       my_contacts: "My Contacts"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
-      remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
+      remove_person_from_aspect: "Tynnu %{person_name} oddi ar \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
       title: "Contacts"
       your_contacts: "Your Contacts"
@@ -210,7 +213,7 @@ cy:
   conversations: 
     create: 
       fail: "Invalid message"
-      sent: "Message sent"
+      sent: "Neges wedi anfon"
     destroy: 
       success: "Conversation successfully removed"
     helper: 
@@ -224,8 +227,8 @@ cy:
     index: 
       create_a_new_message: "create a new message"
       inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
+      message_inbox: "Neges Inbox"
+      new_message: "Neges Newydd"
       no_conversation_selected: "no conversation selected"
       no_messages: "no messages"
     new: 
@@ -252,13 +255,13 @@ cy:
       correct_the_following_errors_and_try_again: "Correct the following errors and try again."
       invalid_fields: "Invalid Fields"
   fill_me_out: "Fill me out"
-  find_people: "Find people"
+  find_people: "Dod o hyd i bobl neu # tagiau"
   hide: "Hide"
   home: 
     show: 
       already_account: "already have an account?"
       choice: "Choice"
-      choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
+      choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects - agweddau yng nghymraeg. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
       learn_about_host: "Learn about how to host your own Diaspora server"
       login_here: "log in here"
       ownership: "Ownership"
@@ -288,6 +291,7 @@ cy:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Send an invitation"
@@ -299,7 +303,7 @@ cy:
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
       whats_new: "what's new?"
-      your_aspects: "your aspects"
+      your_aspects: "eich agweddau"
     header: 
       admin: "admin"
       blog: "blog"
@@ -322,8 +326,8 @@ cy:
       people_like_this: 
         few: "%{count} people liked this"
         many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
+        one: "1 unigolyn yn hoffi hyn"
+        other: "%{count} pobl yn hoffi hyn"
         two: "%{count} likes"
         zero: "no people liked this"
       people_like_this_comment: 
@@ -379,12 +383,12 @@ cy:
       mark_all_as_read: "Nodiad pob wedi darllen"
       notifications: "Hysbysiadau"
     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: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
+      many: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
+      one: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
+      other: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
+      two: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
+      zero: "Mae %{actors} wedi newydd hoffi eich %{post_link}."
     liked_post_deleted: 
       few: "%{actors} yn hoffi y post bod chi wedi dileu."
       many: "%{actors} yn hoffi y post bod chi wedi dileu."
@@ -406,64 +410,64 @@ cy:
       other: "%{actors} mentioned you in a deleted post."
       two: "%{actors} mentioned you in a deleted post."
       zero: "%{actors} mentioned you in a deleted post."
-    post: "postio"
+    post: "post"
     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: "Mae %{actors} wedi anfon neges iddych chi."
+      many: "Mae %{actors} wedi anfon neges iddych chi."
+      one: "Mae %{actors} wedi anfon neges iddych chi."
+      other: "Mae %{actors} wedi anfon neges iddych chi."
+      two: "Mae %{actors} wedi anfon neges iddych chi."
+      zero: "Mae %{actors} wedi anfon neges iddych chi."
     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: "Mae %{actors} wedi ailrhannu eich %{post_link}."
+      many: "Mae %{actors} wedi ailrhannu eich %{post_link}."
+      one: "Mae %{actors} wedi ail-bostio eich %{post_link}."
+      other: "Mae %{actors} wedi ail-bostio eich %{post_link}."
+      two: "Mae %{actors} wedi ailrhannu eich %{post_link}."
+      zero: "Mae %{actors} wedi ail-bostio eich %{post_link}."
     reshared_post_deleted: 
-      few: "%{actors} reshared your deleted post."
-      many: "%{actors} reshared your deleted post."
-      one: "%{actors} reshared your deleted post."
-      other: "%{actors} reshared your deleted post."
-      two: "%{actors} reshared your deleted post."
-      zero: "%{actors} reshared your deleted post."
+      few: "mae %{actors} wedi rhannu eich post wedi dileu."
+      many: "mae %{actors} wedi rhannu eich post wedi dileu."
+      one: "mae %{actors} wedi rhannu eich post wedi dileu."
+      other: "%{actors} wedi rhannu y swydd yr ydych yn dileu."
+      two: "mae %{actors} wedi rhannu eich post wedi dileu."
+      zero: "%{actors} wedi rhannu y swydd yr ydych yn dileu."
     started_sharing: 
-      few: "%{actors} wedi dechrau rhannu gyda chi."
-      many: "%{actors} wedi dechrau rhannu gyda chi."
-      one: "%{actors} wedi dechrau rhannu gyda chi."
-      other: "%{actors} wedi dechrau rhannu gyda chi."
-      two: "%{actors} started sharing with you."
-      zero: "%{actors} wedi dechrau rhannu gyda chi."
+      few: "Mae %{actors} wedi dechrau rhannu gyda chi."
+      many: "Mae %{actors} wedi dechrau rhannu gyda chi."
+      one: "Mae %{actors} wedi dechrau rhannu gyda chi."
+      other: "Mae %{actors} wedi dechrau rhannu gyda chi."
+      two: "Mae %{actors} wedi dechrau rhannu gyda chi."
+      zero: "Mae %{actors} wedi dechrau rhannu gyda chi."
   notifier: 
-    a_post_you_shared: "a post."
-    click_here: "click here"
+    a_post_you_shared: "post."
+    click_here: "cliciwch yma"
     comment_on_post: 
-      reply: "Reply or view %{name}'s post >"
+      reply: "Ateb neu gweld post %{name} >"
     confirm_email: 
       click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
       subject: "Please activate your new e-mail address %{unconfirmed_email}"
     email_sent_by_diaspora: "This email was sent by Diaspora.  If you'd like to stop getting emails like this,"
     hello: "Helo %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
-      view_post: "View post >"
+      liked: "Mae %{name} wedi newydd hoffi eich post: "
+      view_post: "Gweld y post >"
     mentioned: 
       mentioned: "mentioned you in a post:"
       subject: "%{name} has mentioned you on Diaspora*"
     private_message: 
       reply_to_or_view: "Reply to or view this conversation >"
     reshared: 
-      reshared: "%{name} just reshared your post"
-      view_post: "View post >"
+      reshared: "Mae%{name} wedi newydd ail-bostio eich post"
+      view_post: "Gweld y post >"
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "wedi dechrau rhannu gyda chi!"
+      subject: "Mae %{name} wedi dechrau rhannu gyda chi i mewn Diaspora*"
       view_profile: "View %{name}'s profile"
-    thanks: "Thanks,"
+    thanks: "Diolch,"
     to_change_your_notification_settings: "to change your notification settings"
   ok: "OK"
   or: "neu"
@@ -474,7 +478,7 @@ cy:
       add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
-    few: "%{count} people"
+    few: "%{count} pobl"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
@@ -483,35 +487,35 @@ cy:
       no_one_found: "...and no one was found."
       no_results: "Hey! You need to search for something."
       results_for: "search results for"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} pobl"
+    one: "1 unigolyn"
+    other: "%{count} pobl"
     person: 
-      add_contact: "add contact"
+      add_contact: "anadu cysylltiad"
       already_connected: "Already connected"
       pending_request: "pending request"
-      thats_you: "thats you!"
+      thats_you: "chi sy hyn!"
     profile_sidebar: 
       bio: "bio"
       born: "born"
       edit_my_profile: "Edit my profile"
       gender: "gender"
-      in_aspects: "in aspects"
+      in_aspects: "i mewn agweddau"
       location: "location"
-      remove_contact: "remove contact"
+      remove_contact: "dileu cysylltiad"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
-      does_not_exist: "Person does not exist!"
+      does_not_exist: "Dydy'r unigolyn ddim yn bodoli!"
       has_not_shared_with_you_yet: "%{name} has not shared any posts with you yet!"
       incoming_request: "You have an incoming request from this person."
       mention: "Mention"
-      message: "Message"
+      message: "Neges"
       not_connected: "You are not connected with this person"
       recent_posts: "Recent Posts"
       recent_public_posts: "Recent Public Posts"
-      return_to_aspects: "Return to your aspects page"
-      see_all: "See all"
-      start_sharing: "start sharing"
+      return_to_aspects: "Mynd yn ôl i dudalen agweddau"
+      see_all: "Gweld popeth"
+      start_sharing: "dechrau rhannu"
       to_accept_or_ignore: "to accept or ignore it."
     sub_header: 
       add_some: "add some"
@@ -522,7 +526,7 @@ cy:
       fail: "Sorry, we couldn't find %{handle}."
     zero: "no people"
   photos: 
-    comment_email_subject: "%{name}'s photo"
+    comment_email_subject: "ffoto %{name}"
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
       runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
@@ -532,7 +536,7 @@ cy:
     edit: 
       editing: "Editing"
     new: 
-      back_to_list: "Nol i'r Rhestr"
+      back_to_list: "Nôl i'r Rhestr"
       new_photo: "New Photo"
       post_it: "post it!"
     new_photo: 
@@ -543,7 +547,7 @@ cy:
       or_select_one: "or select one from your already existing"
       upload: "Upload a new profile photo!"
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "gweld lluniau %{name} i gŷd"
     show: 
       collection_permalink: "collection permalink"
       delete_photo: "Dileu'r Llun"
@@ -574,11 +578,11 @@ cy:
       last_name: "Last name"
       update_profile: "Update Profile"
       your_bio: "Your bio"
-      your_birthday: "Your birthday"
+      your_birthday: "Eich penblwydd"
       your_gender: "Your gender"
       your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
+      your_name: "Eich enw"
+      your_photo: "Eich ffoto"
       your_private_profile: "Your private profile"
       your_public_profile: "Your public profile"
       your_tags: "You: in 5 #tags"
@@ -618,7 +622,7 @@ cy:
       sending: "Sending..."
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
-      error: "Dewiswch aspect!"
+      error: "Dewiswch agwedd!"
       ignore: "Ignored friend request."
       success: "Ffrindiau ydych chi!"
     helper: 
@@ -637,20 +641,20 @@ cy:
   reshares: 
     comment_email_subject: "%{resharer}'s reshare of %{author}'s post"
     create: 
-      failure: "There was an error resharing this post."
+      failure: "Roedd camgymeriad yn rhannu y swydd hon."
     reshare: 
       deleted: "Post gwreiddiol wedi cael ei ddileu gan yr awdur."
       reshare: 
-        few: "%{count} Reshares"
-        many: "%{count} Reshares"
-        one: "1 Reshare"
-        other: "%{count} Reshares"
-        two: "%{count} reshares"
-        zero: "Reshare"
-      reshare_confirmation: "Reshare %{author} - %{text}?"
-      reshare_original: "Reshare orignial"
-      reshared_via: "reshared via"
-      show_original: "Show Original"
+        few: "rhannwyd %{count} weithiau"
+        many: "rhannwyd %{count} weithiau"
+        one: "Rhannwyd unwaith"
+        other: "rhannwyd %{count} weithiau"
+        two: "rhannwyd %{count} weithiau"
+        zero: "Ailrhannu"
+      reshare_confirmation: "Ailrhannu post %{author}?"
+      reshare_original: "Ailrhannu"
+      reshared_via: "ailrhannwyd gan"
+      show_original: "Dangos yr wreiddiol"
   search: "Search"
   services: 
     create: 
@@ -662,20 +666,20 @@ cy:
     failure: 
       error: "there was an error connecting that service"
     finder: 
-      no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      no_friends: "Dim ffrindiau Facebook wedi darganfod."
+      service_friends: "Ffrindiau %{service}"
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_tumblr: "Connect to Tumblr"
-      connect_to_twitter: "Connect to twitter"
+      connect_to_facebook: "Cysylltiad gyda Facebook"
+      connect_to_tumblr: "Cysylltiad gyda Tumblr"
+      connect_to_twitter: "Cysylltiad gyda Twitter"
       disconnect: "datgysylltu"
       edit_services: "Edit services"
       logged_in_as: "mewngofnodi fel"
       no_services: "You have not connected any services yet."
-      really_disconnect: "disconnect %{service}?"
+      really_disconnect: "datgysylltu %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Click this link to accept your invitation"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      join_me_on_diaspora: "Cysylltu gyda fi mewn DIASPORA*"
     remote_friend: 
       invite: "invite"
       not_on_diaspora: "Not yet on Diaspora"
@@ -688,25 +692,25 @@ cy:
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      your_diaspora_username_is: "%{diaspora_handle} ydy eich enw Diaspora"
     aspect_dropdown: 
       add_to_aspect: "Add to aspect"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        two: "In %{count} aspects"
+        few: "Mewn %{count} agweddau"
+        many: "Mewn %{count} agweddau"
+        one: "Mewn %{count} agwedd"
+        other: "Mewn %{count} agweddau"
+        two: "Mewn %{count} agweddau"
         zero: "Add to aspect"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Cysylltiadau i gŷd"
     footer: 
       logged_in_as: "logged in as %{name}"
-      your_aspects: "your aspects"
+      your_aspects: "eich agweddau"
     invitations: 
-      by_email: "by Email"
+      by_email: "gan e-bost"
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      from_facebook: "From Facebook"
+      from_facebook: "O Facebook"
       invitations_left: "(%{count} left)"
       invite_someone: "Invite someone"
       invite_your_friends: "Invite your friends"
@@ -725,31 +729,32 @@ cy:
       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"
+      all_contacts: "cysylltiadau i gŷd"
       discard_post: "Discard post"
       make_public: "gwneud yn gyhoeddus"
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post neges i %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
       upload_photos: "Upload photos"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "Am be' dych chi'n meddwl?"
     reshare: 
       reshare: "Rhannu eto"
     stream_element: 
-      connect_to_comment: "Connect to this user to comment on their post"
+      connect_to_comment: "Cyswllt i ddefnyddiwr hwn i gynnig sylwadau ar eu swydd"
       currently_unavailable: "commenting currently unavailable"
       dislike: "I dislike this"
       hide_and_mute: "Hide and Mute"
-      like: "I like this"
+      like: "Dwi'n hoffi hyn"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
+      unlike: "Dim hoffi"
       via: "via %{link}"
-      viewable_to_anyone: "This post is viewable to anyone on the web"
+      viewable_to_anyone: "Mae'r post hon yn weladwy i unrhyw un ar y we"
   status_messages: 
     create: 
       success: "Successfully mentioned: %{names}"
@@ -771,7 +776,7 @@ cy:
     show_more_comments: "Show %{number} more comments"
   streams: 
     aspects: 
-      title: "Your Aspects"
+      title: "Eich Agweddau"
     aspects_stream: "Aspects"
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
@@ -835,7 +840,7 @@ cy:
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
-      change_email: "Change E-Mail"
+      change_email: "Newid yr E-Bost"
       change_language: "Newid yr iaith"
       change_password: "Newid cyfrinair"
       close_account: "Cau gyfrif"
@@ -853,7 +858,7 @@ cy:
       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?"
+      reshared: "...rhywun yn rhannu eich post?"
       show_community_spotlight: "Show Community Spotlight in Stream?"
       show_getting_started: "Re-enable Getting Started"
       started_sharing: "...someone starts sharing with you?"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 8937a350f..e1ff84bb2 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -105,16 +105,19 @@ da:
       help: 
         do_you: "Har du:"
         email_feedback: "%{link} din tilbagemelding, hvis du foretrækker det"
-        feature_and_forum: "%{gs} & %{forum}: Samfunds-drevne support og funktion anmodninger"
         feature_suggestion: "... har du et %{link} forslag?"
         find_a_bug: "... find et %{link}?"
         have_a_question: "... har du et %{link}?"
         here_to_help: "Diaspora samfundet er her!"
         need_help: "Brug for hjælp?"
         satisfaction: "%{link}: Samfunds-drevet support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Samfunds-drevne vejledninger, how-tos, og nyheder"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Ingen kontakter"
       no_tags: "+ Find et tag for at følge"
       people_sharing_with_you: "Personer der deler med dig"
@@ -288,6 +291,7 @@ da:
       comma_seperated_plz: "Du kan indtaste flere e-mailadresser adskilt med komma."
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet til det aspekt du inviterede dem til."
       invite_someone_to_join: "Invitér en person til Diaspora!"
+      language: "Language"
       personal_message: "Personlig besked"
       resend: "Send igen"
       send_an_invitation: "Send en invitation"
@@ -731,6 +735,7 @@ da:
       new_user_prefill: 
         hello: "Hej allesammen, jeg er #%{new_user_tag}. "
         i_like: "Jeg interesserer mig for %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
       publishing_to: "del med: "
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index a695678a7..17e99e511 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -29,16 +29,16 @@ de:
         reshare: 
           attributes: 
             root_guid: 
-              taken: "Du hast diesen Beitrag bereits weitergesagt!"
+              taken: "Ziemlich gut, was? Du hast diesen Beitrag bereits weitergesagt!"
         user: 
           attributes: 
             email: 
-              taken: "wird schon benutzt."
+              taken: "ist schon vergeben."
             person: 
               invalid: "ist ungültig."
             username: 
               invalid: "ist ungültig. Wir erlauben nur Buchstaben, Zahlen und Unterstriche."
-              taken: "wird schon benutzt."
+              taken: "ist schon vergeben."
   ago: "Vor %{time}"
   all_aspects: "Alle Aspekte"
   application: 
@@ -67,7 +67,7 @@ de:
     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_not_visible: "Kontakte in diesem Aspekt können einander nicht sehen."
     contacts_visible: "Kontakte in diesem Aspekt können sich untereinander sehen."
     create: 
       failure: "Fehler beim Erstellen des Aspekts."
@@ -93,28 +93,31 @@ de:
       remove: "entfernen"
     index: 
       cubbies: 
-        explanation: "Cubbi.es ist die erste Diaspora Anwendung."
+        explanation: "Cubbi.es ist die erste momentan entwickelte Diaspora Anwendung."
         heading: "Mit Cubbi.es verbinden"
         learn_more: "Mehr erfahren"
       diaspora_id: 
-        content_1: "Deine Diaspora ID ist:"
+        content_1: "Deine Diaspora-ID ist:"
         content_2: "Gib diese weiter und sei somit auf Diaspora leicht zu finden."
-        heading: "Diaspora ID"
+        heading: "Diaspora-ID"
       donate: "Spenden"
-      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."
+      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} Dein Feedback für Diaspora"
-        feature_and_forum: "%{gs} & %{forum}: Unterstützung durch die Gemeinschaft und Anfragen für neue Features"
-        feature_suggestion: "… einen %{link} Vorschlag?"
+        email_feedback: "Dein Feedback für Diaspora per %{link}"
+        feature_suggestion: "… einen %{link}-Vorschlag?"
         find_a_bug: "… einen %{link} gefunden?"
         have_a_question: "… eine %{link}?"
-        here_to_help: "Die Diaspora-Community ist hier!"
+        here_to_help: "Die Diaspora-Gemeinschaft ist hier!"
         need_help: "Benötigst du Hilfe?"
         satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Von der Gemeinschaft erstellte Tutorials, Anleitungen, und Nachrichten"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Folge %{link} und begrüße neue Benutzer bei Diaspora*!"
+        learn_more: "mehr erfahren"
+        title: "Begrüße neue Benutzer"
       no_contacts: "Keine Kontakte"
       no_tags: "+ Finde einen #Tag zum folgen"
       people_sharing_with_you: "Leute, die mit dir teilen"
@@ -136,7 +139,7 @@ de:
     no_contacts_message: 
       community_spotlight: "Gemeinschafts-Schaukasten"
       or_spotlight: "Du kannst auch mit %{link} teilen"
-      try_adding_some_more_contacts: "Du kannst nach Kontakten suchen oder welche einladen."
+      try_adding_some_more_contacts: "Du kannst weitere Kontakte suchen oder welche einladen."
       you_should_add_some_more_contacts: "Du solltest ein paar neue Kontakte hinzufügen!"
     no_posts_message: 
       start_talking: "Niemand hat bisher etwas gesagt!"
@@ -165,7 +168,7 @@ de:
       revoke_access: "Zugriff widerrufen"
   back: "Zurück"
   bookmarklet: 
-    explanation: "Erstelle einen Beitrag in Diaspora von überall, in dem du %{link} als Lesezeichen speicherst."
+    explanation: "Erstelle von überall einen Beitrag in Diaspora, indem du %{link} als Lesezeichen speicherst."
     explanation_link_text: "diesen Link"
     heading: "Bookmarklet"
     post_something: "Erstelle einen Beitrag in Diaspora"
@@ -195,7 +198,7 @@ de:
       no_contacts: "Sieht so aus, als müsstest du einige Kontakte hinzufügen!"
       only_sharing_with_me: "Nur mit dir Teilende"
       remove_person_from_aspect: "Entferne %{person_name} aus \"%{aspect_name}\""
-      start_a_conversation: "Starte eine Unterhaltung"
+      start_a_conversation: "Beginne eine Unterhaltung"
       title: "Kontakte"
       your_contacts: "Deine Kontakte"
     many: "%{count} Kontakte"
@@ -269,7 +272,7 @@ de:
       tagline_first_half: "Teile was du willst,"
       tagline_second_half: "mit wem du willst."
   invitations: 
-    a_facebook_user: "Ein Facebook Nutzer"
+    a_facebook_user: "Ein Facebook-Nutzer"
     check_token: 
       not_found: "Einladungstoken nicht gefunden"
     create: 
@@ -288,6 +291,7 @@ de:
       comma_seperated_plz: "Du kannst mehrere E-Mail-Adressen durch Trennen mit Kommata eintragen."
       if_they_accept_info: "Wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den du sie eingeladen hast."
       invite_someone_to_join: "Lade jemanden zu Diaspora ein!"
+      language: "Sprache"
       personal_message: "Persönliche Nachricht"
       resend: "Erneut senden"
       send_an_invitation: "Eine Einladung senden"
@@ -331,7 +335,7 @@ de:
         many: "Gefällt %{count}"
         one: "Gefällt %{count}"
         other: "Gefällt %{count}"
-        two: "%{count} Personen gefällt das"
+        two: "Gefällt %{count}"
         zero: "Gefällt niemandem"
   limited: "Begrenzt"
   more: "Mehr"
@@ -350,7 +354,7 @@ de:
       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."
+      two: "%{actors} haben einen inzwischen gelöschten Beitrag kommentiert."
       zero: "Niemand hat einen inzwischen gelöschten Beitrag kommentiert."
     comment_on_post: 
       few: "%{actors} haben deinen %{post_link} kommentiert."
@@ -484,7 +488,7 @@ de:
       no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
     many: "%{count} Personen"
-    one: "Eine Person"
+    one: "einer Person"
     other: "%{count} Personen"
     person: 
       add_contact: "Kontakt hinzufügen"
@@ -520,7 +524,7 @@ de:
     two: "%{count} Personen"
     webfinger: 
       fail: "Entschuldigung, wir konnten %{handle} nicht finden."
-    zero: "Keine Personen"
+    zero: "keiner Person"
   photos: 
     comment_email_subject: "%{name}s Foto"
     create: 
@@ -647,7 +651,7 @@ de:
         other: "%{count} mal weitergesagt"
         two: "%{count} mal weitergesagt"
         zero: "Weitersagen"
-      reshare_confirmation: "%{author}'s Beitrag weitersagen?"
+      reshare_confirmation: "%{author}s Beitrag weitersagen?"
       reshare_original: "Original weitersagen"
       reshared_via: "weitergesagt durch"
       show_original: "Original anzeigen"
@@ -731,6 +735,7 @@ de:
       new_user_prefill: 
         hello: "Hallo zusammen, ich bin #%{new_user_tag}. "
         i_like: "Ich interessiere mich für %{tags}."
+        invited_by: "Danke für die Einladung,"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
       publishing_to: "Veröffentlichen an: "
@@ -784,7 +789,7 @@ de:
     mentioned_stream: "@Erwähnungen"
     mentions: 
       contacts_title: "Personen, die dich erwähnt haben"
-      title: "Deine Erwähnungen"
+      title: "@Erwähnungen"
     multi: 
       contacts_title: "Personen in deinem Stream"
       title: "Stream"
@@ -799,7 +804,7 @@ de:
   tag_followings: 
     create: 
       failure: "Fehler beim Folgen von: #%{name}. Folgst du #%{name} bereits?"
-      success: "Du folgst nun: #%{name}"
+      success: "Hurra! Du folgst nun: #%{name}"
     destroy: 
       failure: "Fehler beim Beenden des Folgens von: #%{name}"
       success: "Du folgst #%{name} nicht mehr"
@@ -815,7 +820,7 @@ de:
   tokens: 
     show: 
       connect_to_cubbies: "Mit Cubbi.es verbinden"
-      connecting_is_simple: "Dein Diaspora Konto mit Cubbi.es zu verbinden ist einfach! Trage einfach deine Diaspora ID in der Cubbi.es <a href='%{href_link}'>Einstellungsseite</a> ein und verbinde die Konten!"
+      connecting_is_simple: "Dein Diaspora Konto mit Cubbi.es zu verbinden ist einfach! Trage einfach deine Diaspora ID (<b>%{diaspora_id}</b>) in der Cubbi.es <a href='%{href_link}'>Einstellungsseite</a> ein und verbinde die Konten!"
       daniels_account: "Daniels Diaspora Konto"
       log_in_with_diaspora_is_comming: "Schon bald wirst du in der Lage sein, eine Verbindung zu einer neuen Anwendung herzustellen, ohne ein seperates Konto neben deinem Konto auf Diaspora anzulegen."
       love_to_try: "Es wäre toll, wenn du es ausprobieren würdest."
@@ -855,7 +860,7 @@ de:
       receive_email_notifications: "E-Mail-Benachrichtigungen empfangen, wenn …"
       reshared: "… jemand deinen Beitrag weitersagt?"
       show_community_spotlight: "Gemeinschafts-Schaukasten im Stream anzeigen?"
-      show_getting_started: "Einstieg reaktivieren"
+      show_getting_started: "Einstiegshinweise wieder aktivieren"
       started_sharing: "… jemand mit dir zu teilen anfängt?"
       stream_preferences: "Stream-Einstellungen"
       your_email: "Deine E-Mail-Adresse"
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index 3ee121e49..75328b390 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -105,16 +105,19 @@ de_formal:
       help: 
         do_you: "Haben Sie:"
         email_feedback: "%{link} Ihr 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ötigen Sie Hilfe?"
         satisfaction: "%{link}: Unterstützung durch die Gemeinschaft"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Von der Gemeinschaft erstellte Tutorials, Anleitungen, und Nachrichten"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Das ist ihr Stream. Legen Sie los und stellen Sie sich vor."
       keep_us_running: "Helfen Sie, %{pod} schnell zu arbeiten und kaufen Sie unseren Servern ihren monatlichen Schuss Kaffee!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Keine Kontakte"
       no_tags: "+ Finden Sie einen #Tag zum folgen"
       people_sharing_with_you: "Leute, die mit Ihnen teilen"
@@ -288,6 +291,7 @@ de_formal:
       comma_seperated_plz: "Sie können mehrere E-Mail-Adressen durch Trennen mit Kommata eintragen."
       if_they_accept_info: "Wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den Sie sie eingeladen haben."
       invite_someone_to_join: "Laden Sie jemanden zu Diaspora ein!"
+      language: "Language"
       personal_message: "Persönliche Nachricht"
       resend: "Erneut senden"
       send_an_invitation: "Eine Einladung senden"
@@ -731,6 +735,7 @@ de_formal:
       new_user_prefill: 
         hello: "Hallo zusammen, ich bin #%{new_user_tag}. "
         i_like: "Ich interessiere mich für %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Senden Sie eine Nachricht an %{aspect}"
       posting: "Senden …"
       publishing_to: "Veröffentlichen an: "
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index fe180eaae..45ed94f01 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -105,16 +105,19 @@ el:
       help: 
         do_you: "Μήπως.."
         email_feedback: "%{link} your feedback, if you prefer"
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
         feature_suggestion: "... έχεις μια %{link} πρόταση?"
         find_a_bug: "... βρες %{link}?"
         have_a_question: "... έχεις ένα %{link}?"
         here_to_help: "Η κοινότητα του Diaspora είναι εδώ για να σε βοηθήσει!"
         need_help: "Χρειάζεστε βοήθεια;"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Αυτή είναι η Ροή σας. Μπείτε και συστηθείτε."
       keep_us_running: "Διατηρείστε τη καλή λειτουργία του %{pod}, παρέχοντας στους servers μας τη καφείνη τους!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Καμία επαφή"
       no_tags: "+ Βρείτε μια ετικέτα να ακολουθείτε"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
@@ -288,6 +291,7 @@ el:
       comma_seperated_plz: "Μπορείτε να εισάγετε πολλαπλές διευθύνσεις ηλεκτρονικού ταχυδρομείου διαχωρισμένες με κόμμα."
       if_they_accept_info: "αν δεχτούν, θα προστεθούν στην πτυχή που τους πρασκαλέσατε. "
       invite_someone_to_join: "Προσκαλέστε κάποιον στο Diaspora!"
+      language: "Language"
       personal_message: "Προσωπικό μήνυμα"
       resend: "Αποστολή ξανά"
       send_an_invitation: "Στείλτε μια πρόσκληση"
@@ -731,6 +735,7 @@ el:
       new_user_prefill: 
         hello: "Γεια σε όλους, είμαι #%{new_user_tag}. "
         i_like: "Με ενδιαφέρουν οι ετικέτες %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
       publishing_to: "δημοσίευση στο: "
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 7b7c24306..8d2bbcd0b 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -105,16 +105,19 @@ en_1337:
       help: 
         do_you: "D0 U:"
         email_feedback: "%{link} Y0UR F33DB4CK!"
-        feature_and_forum: "%{gs} & %{forum}: 5UPP0R7 & F347UR3 R3QU3575!"
         feature_suggestion: "... H4V3 4 %{link} 5UGG35710N?"
         find_a_bug: "... F0UND 4 %{link}?"
         have_a_question: "... H4V3 4 %{link}?"
         here_to_help: "45K PR0G4M3R5!"
         need_help: "N33D H3LP?"
         satisfaction: "%{link}: C0MMUN17Y-P0W3R3D 5UPP0R7!"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: 7U70R14L5, H0W705, N3W5, 37C..."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "K33P %{pod} UP BY D0N471NG 3V3RY M0N7H!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "N0 N00B5"
       no_tags: "+ F1ND 4 #74G 2 F0LL0W"
       people_sharing_with_you: "N00B5 5H4R1NG W17H U!"
@@ -288,6 +291,7 @@ en_1337:
       comma_seperated_plz: "U C4N 5P4M MUL71PL3 M41L5, 53P3R473 7H3M BY 4 C0MM4!"
       if_they_accept_info: "1F 7H3Y 4CC3P7, 7H3Y W1LL B3 4DD3D 2 7H3 45P3C7 U 1NV173D 7H3M!"
       invite_someone_to_join: "5P4M 50M30N3 2 J01N D*!"
+      language: "Language"
       personal_message: "P3R50N4L M3554G3"
       resend: "R35P4M!"
       send_an_invitation: "53ND 4 5P4M!"
@@ -731,6 +735,7 @@ en_1337:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "5P4M 7H15 45P3C7: %{aspect}"
       posting: "5P4MM1NG..."
       publishing_to: "PUBL15H1NG 2: "
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index e555eb38d..b4a463d3e 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -105,16 +105,19 @@ en_pirate:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No mateys"
       no_tags: "+ Find a tag to follow"
       people_sharing_with_you: "People sharing with you"
@@ -191,7 +194,7 @@ en_pirate:
       all_contacts: "All yer mateys"
       check_out: "Check out"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
+      my_contacts: "Me Mateys"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
       remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
@@ -288,6 +291,7 @@ en_pirate:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Send an invitation"
@@ -305,10 +309,10 @@ en_pirate:
       blog: "blog"
       code: "code"
       login: "log in"
-      logout: "abandon ship"
-      profile: "profile"
+      logout: "Abandon Ship"
+      profile: "Ye Ship"
       recent_notifications: "Recent notifications"
-      settings: "settings"
+      settings: "Ye Ships Rigging"
       view_all: "View all"
   likes: 
     likes: 
@@ -651,7 +655,7 @@ en_pirate:
       reshare_original: "Reshare original"
       reshared_via: "reshared via"
       show_original: "Show original"
-  search: "Search"
+  search: "Scour"
   services: 
     create: 
       already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
@@ -731,6 +735,7 @@ en_pirate:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 5a22fec7f..c21cd17b9 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -105,16 +105,19 @@ en_shaw:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "𐑒𐑰𐑐 %{pod} 𐑮𐑳𐑯𐑦𐑙 𐑓𐑨𐑕𐑑, 𐑚𐑲 𐑬𐑮 𐑕𐑻𐑝𐑼𐑟 𐑞𐑺 𐑥𐑳𐑯𐑔𐑤𐑦 𐑒𐑪𐑓𐑦 𐑓𐑦𐑒𐑕!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       no_tags: "𐑯𐑴 𐑑𐑨𐑜𐑟"
       people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
@@ -288,6 +291,7 @@ en_shaw:
       comma_seperated_plz: "𐑿 𐑒𐑨𐑯 𐑧𐑯𐑑𐑼 𐑥𐑫𐑤𐑑𐑦𐑐𐑩𐑤 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕𐑩𐑟 𐑕𐑧𐑐𐑼𐑱𐑑𐑩𐑛 𐑚𐑲 𐑒𐑪𐑥𐑩𐑟."
       if_they_accept_info: "𐑦𐑓 𐑞𐑱 𐑩𐑒𐑕𐑧𐑐𐑑, 𐑞𐑱 𐑢𐑦𐑤 𐑚𐑰 𐑨𐑛𐑩𐑛 𐑑 𐑞 𐑨𐑕𐑐𐑧𐑒𐑑 𐑿 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑧𐑥."
       invite_someone_to_join: "𐑦𐑯𐑝𐑲𐑑 𐑕𐑳𐑥𐑢𐑩𐑯 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
+      language: "Language"
       personal_message: "𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑥𐑧𐑕𐑩𐑡"
       resend: "𐑮𐑦𐑕𐑧𐑯𐑛"
       send_an_invitation: "𐑕𐑧𐑯𐑛 𐑩𐑯 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
@@ -731,6 +735,7 @@ en_shaw:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 4edbcc748..30bfcd6e7 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -105,16 +105,19 @@ eo:
       help: 
         do_you: "Ĉu vi:"
         email_feedback: "%{link} viajn respondojn, se vi volas"
-        feature_and_forum: "%{gs} & %{forum}: Jomunuma helpo kaj idepetoj"
         feature_suggestion: "... havas %{link} proponon?"
         find_a_bug: "... trovas %{link}?"
         have_a_question: "... havas %{link}?"
         here_to_help: "Jen la DIASPORA* komunumo!"
         need_help: "Ĉu Devas Helpon?"
         satisfaction: "%{link}: Komunuma helpo"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Komunumaj lerniloj, instruadoj, kaj novaĵoj"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "neniuj kontaktoj"
       no_tags: "+ Trovi etikedon aboni"
       people_sharing_with_you: "Homoj, kiuj konigas kun vi"
@@ -288,6 +291,7 @@ eo:
       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 iun aniĝi al DIASPORA*!"
+      language: "Language"
       personal_message: "Persona mesaĝo"
       resend: "Resendi"
       send_an_invitation: "Sendu inviton"
@@ -731,6 +735,7 @@ eo:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Afiŝi al %{aspect}"
       posting: "Afiŝanta..."
       publishing_to: "koniganta al: "
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index d163bd2f3..747ecf22d 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -105,16 +105,19 @@ es-AR:
       help: 
         do_you: "Do you:"
         email_feedback: "%{link} tu feedback, si preferís"
-        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
         feature_suggestion: "... tiene una %{link} sugerencia?"
         find_a_bug: "... encontro un %{link}?"
         have_a_question: "... tiene un %{link}?"
         here_to_help: "La comunidad de Diáspora está acá!"
         need_help: "Necesitás ayuda?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No hay contactos"
       no_tags: "No tags"
       people_sharing_with_you: "Comparten con vos"
@@ -288,6 +291,7 @@ es-AR:
       comma_seperated_plz: "Podés ingresar varias direcciones de correo electrónico separadas por comas."
       if_they_accept_info: "si aceptan, serán agregados al aspecto que selecciones."
       invite_someone_to_join: "¡Invitá a alguien a unirse a Diáspora*!"
+      language: "Language"
       personal_message: "Mensaje personal"
       resend: "Reenviar"
       send_an_invitation: "Enviar una invitación"
@@ -731,6 +735,7 @@ es-AR:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: "Publicando..."
       publishing_to: "publicar en: "
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 85184255e..0da2d33a1 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -105,16 +105,19 @@ es-CL:
       help: 
         do_you: "Acaso tu:"
         email_feedback: "Si lo prefieres envíanos un %{link} con tu opinión"
-        feature_and_forum: "%{gs} & %{forum}: Soporte impulsado por la comunidad y pedidos de nuevas caracteristicas"
         feature_suggestion: "... tienes una sugerencia(%{link})?"
         find_a_bug: "... encontraste un error(%{link})?"
         have_a_question: "... tienes una pregunta(%{link})?"
         here_to_help: "La comunidad de Diaspora esta aquí!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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é!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No hay contactos"
       no_tags: "+ Busca un tag para seguir"
       people_sharing_with_you: "Personas compartiendo contigo"
@@ -288,6 +291,7 @@ es-CL:
       comma_seperated_plz: "Puedes escribir varias direcciones de correo separadas por comas."
       if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora!"
+      language: "Language"
       personal_message: "Mensaje personal"
       resend: "Reenviar"
       send_an_invitation: "Enviar una invitación"
@@ -731,6 +735,7 @@ es-CL:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
       publishing_to: "publicar en: "
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index fa0e5b310..019db07fe 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -60,7 +60,7 @@ es:
     aspect_contacts: 
       done_editing: "editado"
     aspect_listings: 
-      add_an_aspect: "+ Añadir un aspecto"
+      add_an_aspect: "+ Añade un aspecto"
       deselect_all: "Desmarcar todos"
       edit_aspect: "Editar %{name}"
       select_all: "Marcar todos"
@@ -76,12 +76,12 @@ es:
       failure: "El aspecto %{name} no está vacío y no pudo ser borrado."
       success: "%{name} fue eliminado con éxito."
     edit: 
-      add_existing: "Añadir un contacto existente"
+      add_existing: "Añade un contacto existente"
       aspect_list_is_not_visible: "la lista de contactos del aspecto está ocultada"
       aspect_list_is_visible: "la lista de contactos del aspecto es visible"
       confirm_remove_aspect: "¿Seguro que quieres eliminar este aspecto?"
       done: "Listo"
-      make_aspect_list_visible: "¿Quieres hacer visibles los contactos en este aspecto para los demás contactos?"
+      make_aspect_list_visible: "Permitir que estos contactos puedan ver quien más hay en este aspecto."
       remove_aspect: "Eliminar este aspecto"
       rename: "renombrar"
       update: "actualizar"
@@ -105,16 +105,19 @@ es:
       help: 
         do_you: "Tal vez:"
         email_feedback: "Si lo prefieres, envía tus comentarios a este %{link}."
-        feature_and_forum: "%{gs} y %{forum}: Soporte impulsado por la Comunidad y recepción de propuestas"
         feature_suggestion: "...plantees sugerencias? %{link}"
         find_a_bug: "...encontraste errores? %{link}"
         have_a_question: "...tengas preguntas? %{link}"
         here_to_help: "¡La comunidad Diaspora está aquí!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Tutoriales, wiki y noticias"
       introduce_yourself: "Esta es tu entrada de novedades. Adelante, preséntate..."
       keep_us_running: "Haz que %{pod} vaya más rápido, ¡compra a nuestros servidores sus dosis de café mensual!"
+      new_here: 
+        follow: "¡Sigue %{link} y da la bienvenida a los usuarios nuevos de Diaspora*!"
+        learn_more: "Más información"
+        title: "Bienvenida a los usuarios nuevos"
       no_contacts: "No hay contactos"
       no_tags: "+ Encuentra una etiqueta a seguir"
       people_sharing_with_you: "Comparten contigo"
@@ -186,7 +189,7 @@ es:
       failure: "No se pudo crear el contacto"
     few: "%{count} contactos"
     index: 
-      add_a_new_aspect: "Añadir un nuevo aspecto"
+      add_a_new_aspect: "Añade un nuevo aspecto"
       add_to_aspect: "añadir contactos a %{name}"
       all_contacts: "Todos los contactos"
       check_out: "Echa un vistazo"
@@ -288,6 +291,7 @@ es:
       comma_seperated_plz: "Puedes escribir múltiples direcciones de email separadas por comas."
       if_they_accept_info: "Si aceptan, serán añadidos al aspecto que selecciones."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora*!"
+      language: "Idioma"
       personal_message: "Mensaje personal"
       resend: "Reenviado"
       send_an_invitation: "Enviar una invitación"
@@ -683,7 +687,7 @@ es:
   settings: "Configuración"
   shared: 
     add_contact: 
-      add_new_contact: "Añadir un nuevo contacto"
+      add_new_contact: "Añade un nuevo contacto"
       create_request: "Encontrar por la dirección Diaspora*"
       diaspora_handle: "diaspora@pod.org"
       enter_a_diaspora_username: "Introduce un nombre de usuario Diaspora*:"
@@ -701,7 +705,7 @@ es:
     contact_list: 
       all_contacts: "Todos los contactos"
     footer: 
-      logged_in_as: "conectadx como %{name}"
+      logged_in_as: "accediste como %{name}"
       your_aspects: "tus aspectos"
     invitations: 
       by_email: "Por Email"
@@ -729,8 +733,9 @@ es:
       discard_post: "Descartar publicación"
       make_public: "hacer público"
       new_user_prefill: 
-        hello: "Hola a todos, soy #%{new_user_tag}."
+        hello: "Eih, hola a todos. I'm #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
+        invited_by: "Gracias por la invitación, "
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: "Publicando..."
       publishing_to: "publicar en:"
@@ -776,7 +781,7 @@ es:
     commented_on: "comentado"
     community_spotlight_stream: "Comunidad Creativa"
     followed_tag: 
-      add_a_tag: "Añadir una etiqueta"
+      add_a_tag: "Añade una etiqueta"
       contacts_title: "Gente que sigue esas etiquetas"
       follow: "Seguir"
       title: "#Etiquetas seguidas"
@@ -799,10 +804,10 @@ es:
   tag_followings: 
     create: 
       failure: "Error al seguir a #%{name}. ¿Estás siguiéndolo ya?"
-      success: "¡Ya! Ahora sigues #%{name}"
+      success: "¡Bien! Ahora ya sigues #%{name}."
     destroy: 
-      failure: "Error al dejar de seguir a #%{name}"
-      success: "Ya no sigues más a #%{name}"
+      failure: "Error al dejar de seguir #%{name}. ¿Tal vez ya lo hiciste?"
+      success: "¡Ay! Ya no sigues más #%{name}."
   tags: 
     show: 
       follow: "Seguir #%{tag}"
@@ -817,7 +822,7 @@ es:
       connect_to_cubbies: "Conecta con Cubbi.es"
       connecting_is_simple: "Conectar tu cuenta de Diaspora* es sencillo. Solo introduce tu identidad Diaspora*(<b>%{diaspora_id}</b>) en la página de <a href='%{href_link}'>configuración</a> de tu cuenta cubbi.es y darle a conectar."
       daniels_account: "La cuenta de Diaspora de Daniel"
-      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a una nueva aplicación sin tener que crearte un nueva cuenta aparte de la de Diaspora*."
+      log_in_with_diaspora_is_comming: "Muy pronto podrás conectar a una nueva aplicación sin tener que crear una cuenta aparte de Diaspora*."
       love_to_try: "Nos encantaría que lo pruebes."
       making_the_connection: "Creando la conexión"
       screenshot_explanation: "%{link1}. Este cubby en particular está conectado con %{link2}."
@@ -876,7 +881,7 @@ es:
       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"
+      simply_visit: "Simplemente visita"
       works_on_modern: "Funciona en todos los smartphones modernos"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 596a7c211..bcc3ca0e7 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -105,16 +105,19 @@ eu:
       help: 
         do_you: "Zuk:"
         email_feedback: "%{link} zure feedbacka, nahiago baduzu"
-        feature_and_forum: "%{gs} eta %{forum}: Komunitateak mantentzen duen laguntza eta gaitasun eskaerak"
         feature_suggestion: "... %{link} iradokizun bat duzu?"
         find_a_bug: "... %{link} bat aurkitu?"
         have_a_question: "... %{link} bat duzu?"
         here_to_help: "Diaspora komunitatea hemen dago!"
         need_help: "Laguntza Behar Duzu?"
         satisfaction: "%{link}: Komunitateak mantendutako laguntza"
-        tutorials_and_wiki: "%{tutorial} eta %{wiki}: Komunitateak mantendutako tutorialak, nola-eginak eta berriak"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Hau zure kronologia da.  Animatu eta zure burua aurkeztu."
       keep_us_running: "Mantendu %{pod} azkar izaten, erosiezu gure ostalariei hilabeteroko kafe-konponketa!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Adiskiderik ez"
       no_tags: "+ Aurkitu jarraitzeko etiketa bat"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
@@ -288,6 +291,7 @@ eu:
       comma_seperated_plz: "Nahi dituzun e-posta guztiak idatzi ditzakezu, koma batez bananduta."
       if_they_accept_info: "eskaera onartzen badute, gonbidatutako alderdira batuko dira"
       invite_someone_to_join: "Gonbida ezazu norbait Diasporan izen ematera!"
+      language: "Language"
       personal_message: "Mezu pertsonala"
       resend: "Berbidali"
       send_an_invitation: "Gonbidapen bat bidali"
@@ -731,6 +735,7 @@ eu:
       new_user_prefill: 
         hello: "Kaixo guztioi, #%{new_user_tag} naiz. "
         i_like: "%{tags} interesatzen zait."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
       publishing_to: "hemen partekatzen:"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 2ba1c226c..2bfe2548e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -105,16 +105,19 @@ fi:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Ei kontakteja"
       no_tags: "No tags"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
@@ -252,7 +255,7 @@ fi:
       correct_the_following_errors_and_try_again: "Korjaa seuraavat virheet ja yritä uudelleen."
       invalid_fields: "Vialliset arvot"
   fill_me_out: "Täytä tiedot"
-  find_people: "Find people"
+  find_people: "Etsi ihmisiä tai #tageja"
   hide: "Piilota"
   home: 
     show: 
@@ -288,6 +291,7 @@ fi:
       comma_seperated_plz: "Voit syöttää useita sähköpostiosoitteita pilkuilla erotettuna."
       if_they_accept_info: "jos he hyväksyvät kutsun, heidät lisätään siihen näkymään, johon heidät kutsuit."
       invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!"
+      language: "Language"
       personal_message: "Henkilökohtainen viesti"
       resend: "Lähetä uudelleen"
       send_an_invitation: "Lähetä kutsu"
@@ -305,7 +309,7 @@ fi:
       blog: "blogi"
       code: "lähdekoodi"
       login: "kirjaudu sisään"
-      logout: "kirjaudu ulos"
+      logout: "Kirjaudu ulos"
       profile: "Profiili"
       recent_notifications: "Viimeaikaiset ilmoitukset"
       settings: "Asetukset"
@@ -731,6 +735,7 @@ fi:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       publishing_to: "Julkaistaan: "
@@ -776,7 +781,7 @@ fi:
     commented_on: "commented on"
     community_spotlight_stream: "Community Spotlight"
     followed_tag: 
-      add_a_tag: "Add a tag"
+      add_a_tag: "Lisää tagi"
       contacts_title: "People who dig these tags"
       follow: "Follow"
       title: "#Followed Tags"
@@ -792,7 +797,7 @@ fi:
     public: 
       contacts_title: "Recent Posters"
       title: "Public Activity"
-    recently: "recently:"
+    recently: "äskettäin:"
     tags: 
       contacts_title: "People who dig these tags"
       title: "Posts tagged: %{tags}"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index ea0eff5f4..9f85296f2 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -105,16 +105,19 @@ fr:
       help: 
         do_you: "Avez-vous :"
         email_feedback: "%{link} l'impression, si vous préférez"
-        feature_and_forum: "%{gs} & %{forum} : Support et impressions de la communauté"
         feature_suggestion: "... une suggestion (%{link}) ?"
         find_a_bug: "... trouvé un %{link} ?"
         have_a_question: "... une %{link} ?"
         here_to_help: "La communauté Diaspora est là !"
         need_help: "Besoin d'aide ?"
         satisfaction: "%{link} : Support par la communauté"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriels, notes et actualité de la comunauté"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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 !"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Aucun contact"
       no_tags: "+ Trouver un tag à suivre"
       people_sharing_with_you: "Personnes partageant avec vous"
@@ -288,6 +291,7 @@ fr:
       comma_seperated_plz: "Vous pouvez entrer plusieurs adresses de courrier électronique séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
+      language: "Language"
       personal_message: "Message personnel"
       resend: "Envoyer à nouveau"
       send_an_invitation: "Envoyer une invitation"
@@ -649,7 +653,7 @@ fr:
         zero: "Repartager"
       reshare_confirmation: "Partager le message d'%{author} ?"
       reshare_original: "Partager l'original"
-      reshared_via: "partager via"
+      reshared_via: "repartagé par"
       show_original: "Afficher l'original"
   search: "Rechercher"
   services: 
@@ -731,6 +735,7 @@ fr:
       new_user_prefill: 
         hello: "Bonjour tout le monde, je suis #%{new_user_tag}. "
         i_like: "Je suis intéressé par %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
       publishing_to: "publication vers : "
@@ -799,7 +804,7 @@ fr:
   tag_followings: 
     create: 
       failure: "Erreur lors de la demande de suivi de #%{name}. Le suivez-vous déjà ?"
-      success: "Yep ! Vous suivez maintenant #% {name}."
+      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"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 2ab3cd66b..9b1ea37f5 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -105,16 +105,19 @@ ga:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ ga:
       comma_seperated_plz: "Is féidir leat cúpla sheola a cuir isteach má tá comma idir iad."
       if_they_accept_info: "má gleachann siad, beidh siad cuirthe leis an gné a sheol tú cuireadh ó."
       invite_someone_to_join: "Seol cuireadh go Diaspora chuig duine!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Seol cuireadh"
@@ -731,6 +735,7 @@ ga:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index cd85dc49a..1b0e2ab17 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -105,16 +105,19 @@ he:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "קהילת דיאספורה לרשותך!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "This is your stream.  Jump in and introduce yourself."
       keep_us_running: "כדי שהפוד %{pod} ימשיך לפעול במהירות ולרכוש שרתים נוספים שימו כמה דולרים כל חודש כדי לממן להם איזה כוס קפה!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "אין אנשי קשר"
       no_tags: "+ חיפוש תגית למעקב"
       people_sharing_with_you: "אנשים המשתפים אתך"
@@ -288,6 +291,7 @@ he:
       comma_seperated_plz: "באפשרותך להזין מספר כתובות דוא״ל ולהפרידן בפסיקים."
       if_they_accept_info: "אם הם יאשרו, הם יתווספו להיבט שאליו הזמנת אותם."
       invite_someone_to_join: "להזמין מישהו להשתמש בדיאספורה!"
+      language: "Language"
       personal_message: "הודעה אישית"
       resend: "שליחה חוזרת"
       send_an_invitation: "שליחת הזמנה"
@@ -731,6 +735,7 @@ he:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
       publishing_to: "פרסום אל:"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 84d34dc6b..70a701dfb 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -105,16 +105,19 @@ hu:
       help: 
         do_you: "Te:"
         email_feedback: "Küldd el %{link}-ben a visszajelzésed"
-        feature_and_forum: "%{gs} & %{forum}: Közösségi támogatás és kívánságlista"
         feature_suggestion: "... van egy fejlesztési javaslata? %{link}"
         find_a_bug: "... hibát találtál? %{link}?"
         have_a_question: "... kérdésed van? %{link}"
         here_to_help: "A Diaspora közösség megérkezett!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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."
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Nincs ismerős"
       no_tags: "+ #címke keresése"
       people_sharing_with_you: "Ismerőseid"
@@ -288,6 +291,7 @@ hu:
       comma_seperated_plz: "Megadhatsz több e-mail címet is vesszővel elválasztva."
       if_they_accept_info: "Ha elfogadják felkérésed, akkor belekerülnek abba a csoportba amelyikbe meghívtad őket."
       invite_someone_to_join: "Hívj meg valakit, hogy csatlakozzon a Diaspora-hoz!"
+      language: "Language"
       personal_message: "Személyes üzenet"
       resend: "Újraküld"
       send_an_invitation: "Küldj egy meghívót"
@@ -731,6 +735,7 @@ hu:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
       publishing_to: "Publikálás:"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 4aa3b4fd3..e3b610fd1 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -105,16 +105,19 @@ id:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ id:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Undang seseorang untuk bergabung di Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Kirim sebuah undangan"
@@ -731,6 +735,7 @@ id:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index d1716fcb6..8792c3d6e 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -105,16 +105,19 @@ is:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Engir tengiliðir"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ is:
       comma_seperated_plz: "Þú getur sett inn mörg netföng með því að aðskilja þau með kommu. "
       if_they_accept_info: "ef þau þiggja boðið, verður þeim bætt við þá ásýnd sem þú bauðst þeim á."
       invite_someone_to_join: "Bjóddu einhverjum að tengjast Díaspora!"
+      language: "Language"
       personal_message: "Persónuleg skilaboð"
       resend: "Endursenda"
       send_an_invitation: "Sendu boðsmiða"
@@ -731,6 +735,7 @@ is:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: "Senda..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 55873ae17..0e3f48170 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -105,16 +105,19 @@ it:
       help: 
         do_you: "Vuoi..."
         email_feedback: "Se preferisci, manda un feedback via %{link}"
-        feature_and_forum: "%{gs} & %{forum}: Per proporre idee e avere supporto dalla comunità"
         feature_suggestion: "...proporre un'idea? %{link}"
         find_a_bug: "...segnalare un problema? %{link}"
         have_a_question: "...fare una domanda? %{link}"
         here_to_help: "La comunità di Diaspora è qui!"
         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."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+      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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Nessun contatto"
       no_tags: "+ Cerca tag da seguire"
       people_sharing_with_you: "Persone in condivisione con te"
@@ -288,6 +291,7 @@ it:
       comma_seperated_plz: "Puoi inserire più indirizzi email separati da virgole."
       if_they_accept_info: "se loro accettano, saranno aggiunti all'aspetto in cui li hai invitati."
       invite_someone_to_join: "Invita qualcuno ad entrare in Diaspora!"
+      language: "Language"
       personal_message: "Messaggio privato"
       resend: "Invia di nuovo"
       send_an_invitation: "Invia un invito"
@@ -731,6 +735,7 @@ it:
       new_user_prefill: 
         hello: "Ciao a tutti, eccomi qui! Hey everyone, I'm #%{new_user_tag}"
         i_like: "I miei interessi sono %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       publishing_to: "stai condividendo con: "
@@ -744,7 +749,7 @@ it:
       connect_to_comment: "Connettiti con questo utente per commentare il post"
       currently_unavailable: "al momento non è possibile commentare"
       dislike: "Non mi piace"
-      hide_and_mute: "Nascondi e Disattiva le notifiche"
+      hide_and_mute: "Nascondi e disattiva le notifiche"
       like: "Mi piace"
       shared_with: "Condiviso con: %{aspect_names}"
       unlike: "Annulla"
@@ -771,7 +776,7 @@ it:
     show_more_comments: "Mostra gli altri %{number} commenti"
   streams: 
     aspects: 
-      title: "I tuoi Aspetti"
+      title: "I tuoi aspetti"
     aspects_stream: "Aspetti"
     commented_on: "commenti"
     community_spotlight_stream: "In evidenza dalla comunità"
@@ -786,12 +791,12 @@ it:
       contacts_title: "Persone che ti hanno menzionato"
       title: "@Menzioni"
     multi: 
-      contacts_title: "Persone nel tuo Stream"
+      contacts_title: "Persone nel tuo stream"
       title: "Stream"
     posted: "post"
     public: 
       contacts_title: "Chi ha postato di recente"
-      title: "Attività Pubblica"
+      title: "Attività pubblica"
     recently: "ordina per:"
     tags: 
       contacts_title: "Persone con questo tag"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index a978bcf3b..ea1307818 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -105,16 +105,19 @@ ja:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "連絡先無し"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ ja:
       comma_seperated_plz: "複数のメールアドレスはコンマ区切りで入力可能です。"
       if_they_accept_info: "招待を承諾してくれた場合、招待時のアスペクトに追加されます。"
       invite_someone_to_join: "知り合いをダイアスポラ＊に招待しましょう！"
+      language: "Language"
       personal_message: "個人メッセージ"
       resend: "再送する"
       send_an_invitation: "招待を送信する"
@@ -731,6 +735,7 @@ ja:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect}に投稿する"
       posting: "投稿中"
       publishing_to: "公開先："
@@ -747,7 +752,7 @@ ja:
       hide_and_mute: "Hide and Mute"
       like: "これ好き！"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
+      unlike: "これ好き！を取り消す"
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 646356935..26be32755 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -105,16 +105,19 @@ ko:
       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}: 커뮤니티의 튜토리얼, 설명서와 소식들"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "내 스트림에서 스스로를 나타내십시오."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "컨택 없음"
       no_tags: "태그 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
@@ -288,6 +291,7 @@ ko:
       comma_seperated_plz: "쉼표로 구분하여 여러 이메일 주소를 넣을 수 있습니다."
       if_they_accept_info: "수락한 친구는 초대했던 애스펙에 추가됩니다."
       invite_someone_to_join: "친구를 디아스포라로 초대하세요!"
+      language: "Language"
       personal_message: "쪽지"
       resend: "다시 보내기"
       send_an_invitation: "초대장 보내기"
@@ -731,6 +735,7 @@ ko:
       new_user_prefill: 
         hello: "#%{new_user_tag} 반갑습니다! 새로 가입했습니다."
         i_like: "제 관심사는 %{tags} 입니다."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect}에 공유물 올리기"
       posting: "올리는 중···"
       publishing_to: "올릴 곳: "
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 0e09f9a85..8dfb26a71 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -105,16 +105,19 @@ lt:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ lt:
       comma_seperated_plz: "Keletą el. pašto adresų gali įvesti atskirdamas juos kableliais."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Pakviesk ką nors prisijungti prie Diasporos!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Nusiųsk kvietimą"
@@ -731,6 +735,7 @@ lt:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index d50531bd7..6e4fe09b0 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -105,16 +105,19 @@ mk:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ mk:
       comma_seperated_plz: "Можете да внесете повеќе е-маил адреси разделени со запирки."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Поканете некој да се придружи на Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Испрати покана"
@@ -731,6 +735,7 @@ mk:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 625bf0609..db03db24b 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -105,16 +105,19 @@ nb:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Trenger du hjelp?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Ingen kontakter"
       no_tags: "No tags"
       people_sharing_with_you: "Folk som deler med deg"
@@ -288,6 +291,7 @@ nb:
       comma_seperated_plz: "Du kan skrive inn flere epostadresser delt med komma."
       if_they_accept_info: "Hvis de aksepterer, vil de bli lagt til i aspektet du valgte."
       invite_someone_to_join: "Inviter noen til Diaspora!"
+      language: "Language"
       personal_message: "Personlig melding"
       resend: "Send på nytt"
       send_an_invitation: "Send en invitasjon"
@@ -731,6 +735,7 @@ nb:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
       publishing_to: "publiserer til:"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index dc761ebc2..b23b9a469 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -105,16 +105,19 @@ nl:
       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_suggestion: "... een %{link} suggestie?"
         find_a_bug: "... een %{link} bug gevonden?"
         have_a_question: "... een %{link} vraag?"
         here_to_help: "De Diaspora community staat voor je klaar!"
         need_help: "Hulp nodig?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Geen contacten"
       no_tags: "+ Vind een tag"
       people_sharing_with_you: "Mensen die met jou delen"
@@ -288,6 +291,7 @@ nl:
       comma_seperated_plz: "Je kunt meerdere e-mailadressen invullen, gescheiden door komma's."
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
       invite_someone_to_join: "Nodig iemand uit om lid te worden op Diaspora!"
+      language: "Language"
       personal_message: "Persoonlijk bericht"
       resend: "Stuur opnieuw"
       send_an_invitation: "Stuur een uitnodiging"
@@ -731,6 +735,7 @@ nl:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
       publishing_to: "delen met: "
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 0cca590b8..45522de69 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -105,16 +105,19 @@ nn:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora-felleskapen er her!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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 å gje ein månadleg donasjon."
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Ingen kontaktar"
       no_tags: "+ Finn ein etikett du vil følgja"
       people_sharing_with_you: "Folk som deler med deg"
@@ -288,6 +291,7 @@ nn:
       comma_seperated_plz: "Du kan skriva fleire e-postadresser om du skil dei med komma."
       if_they_accept_info: "om dei godtek, vil dei verta lagde til aspektet du inviterte dei til."
       invite_someone_to_join: "Inviter nokon til å bli med Diaspora!"
+      language: "Language"
       personal_message: "Personleg melding"
       resend: "Send på nytt"
       send_an_invitation: "Send ein invitasjon"
@@ -731,6 +735,7 @@ nn:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Send ei melding til %{aspect}"
       posting: "Sender …"
       publishing_to: "publiserer til:"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 00709cbef..940602f97 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -105,16 +105,19 @@ pa:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ pa:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Send an invitation"
@@ -731,6 +735,7 @@ pa:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 70320839d..e7df83ddc 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -105,16 +105,19 @@ pl:
       help: 
         do_you: "Czy:"
         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: "... 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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Samouczki, instrukcje i aktualności dostarczane przez Społeczność"
       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!"
+      new_here: 
+        follow: "Obserwuj %{link} i powitaj nowych użytkowników Diaspory*!"
+        learn_more: "Dowiedz się więcej"
+        title: "Powitaj nowych użytkowników"
       no_contacts: "Brak kontaktów"
       no_tags: "+ Znajdź znacznik do obserwowania"
       people_sharing_with_you: "Osoby udostępniające Tobie"
@@ -288,6 +291,7 @@ pl:
       comma_seperated_plz: "Możesz podać kilka adresów e-mail, oddzielając je przecinkami."
       if_they_accept_info: "Jeśli wybrana osoba przyjmie zaproszenie, zostanie dodana do aspektów, do których ją zapros@{m:iłeś|f:iłaś|n:zono}."
       invite_someone_to_join: "Zaproś kogoś do Diaspory!"
+      language: "Język"
       personal_message: "Dodatkowa wiadomość"
       resend: "Wyślij ponownie"
       send_an_invitation: "Wyślij zaproszenie"
@@ -332,7 +336,7 @@ pl:
         one: "%{count} osoba to lubi"
         other: "%{count} os. to lubi"
         two: "%{count} ososby to lubią"
-        zero: "nikt tego nie polubił"
+        zero: "nikt nie lubi"
   limited: "Ograniczone"
   more: "Więcej"
   next: "dalej"
@@ -384,14 +388,14 @@ pl:
       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}."
+      zero: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój wpis."
     liked_post_deleted: 
-      few: "%{actors} polubiły twój usunięty wpis."
+      few: "%{actors} polubili Twój usunięty wpis."
       many: "%{actors} lubią twój już usunięty wpis."
-      one: "%{actors} polubił(a) twój usunięty wpis."
-      other: "%{actors} polubił twój usunięty wpis."
-      two: "%{actors} polubiło twój usunięty wpis."
-      zero: "%{actors} polubił twój usunięty wpis."
+      one: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
+      other: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
+      two: "%{actors} polubili Twój usunięty wpis."
+      zero: "%{actors} polubi@{m:ł|f:ła|n:ło} Twój usunięty wpis."
     mentioned: 
       few: "%{actors} wspomnieli o Tobie w %{post_link}."
       many: "%{actors} wspomnieli o Tobie w %{post_link}."
@@ -550,7 +554,7 @@ pl:
       edit: "edycja"
       edit_delete_photo: "Edycja opisu zdjęcia / usuwanie zdjęcia"
       make_profile_photo: "ustaw jako zdjęcie profilowe"
-      show_original_post: "Pokaż oryginalny post"
+      show_original_post: "Wyświetl oryginalny wpis"
       update_photo: "Aktualizacja zdjęcia"
     update: 
       error: "Błąd podczas edycji zdjęcia."
@@ -731,6 +735,7 @@ pl:
       new_user_prefill: 
         hello: "Witajcie wszyscy, jestem #%{new_user_tag}. "
         i_like: "Interesują mnie %{tags}."
+        invited_by: "Dzięki za zaproszenie,"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Publikowanie..."
       publishing_to: "publikuj na:"
@@ -788,7 +793,7 @@ pl:
     multi: 
       contacts_title: "Osoby w Twoim Strumieniu"
       title: "Strumień"
-    posted: "opublikowano"
+    posted: "opublikowane"
     public: 
       contacts_title: "Ostatnio dodawali"
       title: "Działalność publiczna"
@@ -801,7 +806,7 @@ pl:
       failure: "Nie udało się dodać do obserwowanych #%{name}. Może już to obserwujesz?"
       success: "Brawo! Od teraz obserwujesz #%{name}."
     destroy: 
-      failure: "Nie udało się zatrzymać obserwowania: #% {name}"
+      failure: "Nie udało się zatrzymać obserwowania: #% {name}. Może już tego nie obserwujesz?"
       success: "Nie obserwujesz już: #%{name}"
   tags: 
     show: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 37af1881c..1c14825bd 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -105,16 +105,19 @@ pt-BR:
       help: 
         do_you: "Você:"
         email_feedback: "%{link} seu feedback, se você preferir"
-        feature_and_forum: "%{gs} & %{forum}: Suporte comunitário e solicitações de recursos"
         feature_suggestion: "... tem uma sugestão de %{link}?"
         find_a_bug: "... encontrar um %{link}?"
         have_a_question: "... Tem um %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Quer Ajuda?"
         satisfaction: "%{link}: Comunidade de suporte"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriais Comunitários, Como fazer, e Notícias"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Sem contatos"
       no_tags: "+ Procurar tag para seguir"
       people_sharing_with_you: "Pessoas compartilhando com você"
@@ -288,6 +291,7 @@ pt-BR:
       comma_seperated_plz: "Você pode adicionar vários endereços de emails, mas todos devem estar separados por vírgulas."
       if_they_accept_info: "Se aceitarem, eles serão adicionados ao aspecto para o qual você os convidou."
       invite_someone_to_join: "Convide os amigos para participar de Diaspora!"
+      language: "Language"
       personal_message: "Mensagem pessoal"
       resend: "Reenviar"
       send_an_invitation: "Enviar um convite"
@@ -731,6 +735,7 @@ pt-BR:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Postar uma mensagem para %{aspect}"
       posting: "Postando..."
       publishing_to: "publicando para:"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 91b8d6de7..d36d7d20c 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -105,16 +105,19 @@ pt-PT:
       help: 
         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}: Apoio da comunidade"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Tutoriais da comunidade, how-to, e notícias"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Não há contactos"
       no_tags: "+ Encontre uma tag para seguir"
       people_sharing_with_you: "Pessoas a partilhar consigo"
@@ -288,6 +291,7 @@ pt-PT:
       comma_seperated_plz: "Pode inserir vários endereços de email separados por vírgulas."
       if_they_accept_info: "se aceitarem, serão adicionados ao aspecto para o qual os convidou."
       invite_someone_to_join: "Convide alguém para se juntar ao Diaspora!"
+      language: "Language"
       personal_message: "Mensagem pessoal"
       resend: "Reenviar"
       send_an_invitation: "Envie um convite"
@@ -731,6 +735,7 @@ pt-PT:
       new_user_prefill: 
         hello: "Olá a todos, o meu nome é #%{new_user_tag}. "
         i_like: "Estou interessado em %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
       publishing_to: "publicando para:"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 0937a7587..c9f75a2c7 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -4,7 +4,7 @@
 
 
 ro: 
-  _applications: "Applications"
+  _applications: "Aplicaţii"
   _comments: "Comentarii"
   _contacts: "Contacts"
   _home: "Acasă"
@@ -60,7 +60,7 @@ ro:
     aspect_contacts: 
       done_editing: "terminat de editat"
     aspect_listings: 
-      add_an_aspect: "+ Add an aspect"
+      add_an_aspect: "+ Adaugă un aspect"
       deselect_all: "Deselect all"
       edit_aspect: "Edit %{name}"
       select_all: "Select all"
@@ -73,7 +73,7 @@ ro:
       failure: "Crearea aspectului a eşuat."
       success: "S-a creat noul aspect %{name}"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} nu este gol şi nu poate fi şters."
       success: "%{name} a fost eliminat cu succes."
     edit: 
       add_existing: "Adaugă o persoană de contact existentă"
@@ -82,11 +82,11 @@ ro:
       confirm_remove_aspect: "Eşti sigur că doreşti să ştergi acest aspect?"
       done: "Done"
       make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
+      remove_aspect: "Şterge acest aspect"
+      rename: "redenumeşte"
       update: "update"
-      updating: "updating"
-    few: "%{count} aspects"
+      updating: "actualizare"
+    few: "%{count} aspecte"
     helper: 
       are_you_sure: "Eşti sigur că doreşti să ştergi acest aspect?"
       aspect_not_empty: "Aspectul nu este gol"
@@ -97,25 +97,28 @@ ro:
         heading: "Connect to Cubbi.es"
         learn_more: "Learn more"
       diaspora_id: 
-        content_1: "Your Diaspora ID is:"
+        content_1: "ID-ul tău Diaspora este:"
         content_2: "Give it to anyone and they'll be able to find you on Diaspora."
         heading: "Diaspora ID"
-      donate: "Donate"
+      donate: "Donează"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
+      no_contacts: "Niciun contact"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
       post_a_message: "post a message >>"
@@ -125,13 +128,13 @@ ro:
       unfollow_tag: "Stop following #%{tag}"
       welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
       your_aspects: "Your Aspects"
-    many: "%{count} aspects"
+    many: "%{count} aspecte"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
+      error: "Eroare la mutarea contactului: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "S-a mutat persoana la noul aspect"
     new: 
-      create: "Create"
+      create: "Crează"
       name: "Name"
     no_contacts_message: 
       community_spotlight: "community spotlight"
@@ -141,24 +144,24 @@ ro:
     no_posts_message: 
       start_talking: "Nimeni nu a spus nimic deocamdată. Începe tu o conversaţie!"
     one: "1 aspect"
-    other: "%{count} aspects"
+    other: "%{count} aspecte"
     seed: 
       acquaintances: "Acquaintances"
       family: "Familie"
-      friends: "Friends"
+      friends: "Prieteni"
       work: "Lucru"
     selected_contacts: 
       manage_your_aspects: "Manage your aspects."
       no_contacts: "You don't have any contacts here yet."
       view_all_community_spotlight: "See all community spotlight"
-      view_all_contacts: "View all contacts"
+      view_all_contacts: "Vezi toate contactele"
     show: 
       edit_aspect: "Editează aspect"
     two: "%{count} aspects"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
       success: "Aspectul, %{name}, a fost editat cu succes."
-    zero: "no aspects"
+    zero: "niciun aspect"
   authorizations: 
     index: 
       no_applications: "You haven't registered any applications yet."
@@ -183,22 +186,22 @@ ro:
     zero: "no comments"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Eşuare la crearea contactului"
     few: "%{count} contacts"
     index: 
-      add_a_new_aspect: "Add a new aspect"
+      add_a_new_aspect: "Adaugă un aspect nou"
       add_to_aspect: "Add contacts to %{name}"
-      all_contacts: "All Contacts"
+      all_contacts: "Toate contactele"
       check_out: "Check out"
       many_people_are_you_sure: "Are you sure you want to start a private conversation with more than %{suggested_limit} contacts? Posting to this aspect may be a better way to contact them."
-      my_contacts: "My Contacts"
+      my_contacts: "Contactele mele"
       no_contacts: "No contacts."
       only_sharing_with_me: "Only sharing with me"
       remove_person_from_aspect: "Remove %{person_name} from \"%{aspect_name}\""
       start_a_conversation: "Start a conversation"
-      title: "Contacts"
-      your_contacts: "Your Contacts"
-    many: "%{count} contacts"
+      title: "Contacte"
+      your_contacts: "Contactele Tale"
+    many: "%{count} contacte"
     one: "1 contact"
     other: "%{count} contacte"
     sharing: 
@@ -206,34 +209,34 @@ ro:
     spotlight: 
       community_spotlight: "Community Spotlight"
     two: "%{count} contacts"
-    zero: "nici un contact"
+    zero: "contacte"
   conversations: 
     create: 
       fail: "Invalid message"
-      sent: "Message sent"
+      sent: "Mesaj trimis"
     destroy: 
-      success: "Conversation successfully removed"
+      success: "Conversaţia a fost stearsă cu succes"
     helper: 
       new_messages: 
         few: "%{count} new messages"
         many: "%{count} new messages"
         one: "1 new messages"
         other: "%{count} new messages"
-        two: "%{count} new messages"
+        two: "%{count} mesaje noi"
         zero: "no new messages"
     index: 
-      create_a_new_message: "create a new message"
+      create_a_new_message: "crează un mesaj nou"
       inbox: "Inbox"
       message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      new_message: "Mesaj Nou"
+      no_conversation_selected: "nicio conversaţie selectată"
+      no_messages: "niciun mesaj"
     new: 
       abandon_changes: "Abandon changes?"
-      send: "Send"
-      sending: "Sending..."
-      subject: "subject"
-      to: "to"
+      send: "Trimite"
+      sending: "Trimitere..."
+      subject: "subiect"
+      to: "către"
     new_message: 
       fail: "Invalid message"
     show: 
@@ -253,10 +256,10 @@ ro:
       invalid_fields: "Câmpuri invalide"
   fill_me_out: "Umple-mă"
   find_people: "Find people"
-  hide: "Hide"
+  hide: "Ascunde"
   home: 
     show: 
-      already_account: "already have an account?"
+      already_account: "ai deja cont?"
       choice: "Alegere"
       choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
       learn_about_host: "Learn about how to host your own Diaspora server"
@@ -269,7 +272,7 @@ ro:
       tagline_first_half: "Share what you want,"
       tagline_second_half: "with whom you want."
   invitations: 
-    a_facebook_user: "A Facebook user"
+    a_facebook_user: "Un utilizator Facebook"
     check_token: 
       not_found: "Invitaţia nu a fost găsită"
     create: 
@@ -285,9 +288,10 @@ ro:
     new: 
       already_invited: "Deja invitat "
       aspect: "Aspect"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      comma_seperated_plz: "Puteţi introduce multiple adrese de email separate prin virgulă."
       if_they_accept_info: "în cazul în care acceptă, vor fi adăugate la aspectul la care le-ai invitat."
       invite_someone_to_join: "Invită pe cineva pe Diaspora!"
+      language: "Language"
       personal_message: "Mesaj personal"
       resend: "Resend"
       send_an_invitation: "Trimite o invitaţie"
@@ -307,7 +311,7 @@ ro:
       login: "login"
       logout: "Ieşire"
       profile: "profile"
-      recent_notifications: "Recent notifications"
+      recent_notifications: "Notificări recente"
       settings: "settings"
       view_all: "View all"
   likes: 
@@ -333,10 +337,10 @@ ro:
         other: "%{count} likes"
         two: "%{count} likes"
         zero: "no likes"
-  limited: "Limited"
+  limited: "Limitat"
   more: "Mai mult"
   next: "următorul"
-  no_results: "No Results Found"
+  no_results: "Niciun Rezultat Găsit"
   notifications: 
     also_commented: 
       few: "%{actors} also commented on %{post_author}'s %{post_link}."
@@ -361,18 +365,18 @@ ro:
       zero: "%{actors} commented on your %{post_link}."
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
+        few: "%{count} notificări noi"
+        many: "%{count} notificări noi"
         one: "1 new notifications"
-        other: "%{count} new notifications"
+        other: "%{count} notificări noi"
         two: "%{count} new notifications"
         zero: "no new notifications"
     index: 
-      and: "and"
+      and: "şi"
       and_others: 
-        few: "and %{count} others"
+        few: "şi %{count} others"
         many: "and %{count} others"
-        one: "and one more"
+        one: "şi doar unul "
         other: "and %{count} others"
         two: "and %{count} others"
         zero: "and nobody else"
@@ -437,7 +441,7 @@ ro:
       zero: "%{actors} started sharing with you."
   notifier: 
     a_post_you_shared: "a post."
-    click_here: "click here"
+    click_here: "clic aici"
     comment_on_post: 
       reply: "Reply or view %{name}'s post >"
     confirm_email: 
@@ -462,9 +466,9 @@ ro:
     started_sharing: 
       sharing: "has started sharing with you!"
       subject: "%{name} has started sharing with you on Diaspora*"
-      view_profile: "View %{name}'s profile"
+      view_profile: "Vezi profilul lui %{name}"
     thanks: "Mulţumim,"
-    to_change_your_notification_settings: "to change your notification settings"
+    to_change_your_notification_settings: "pentru a schimba setăriile notificărilor"
   ok: "OK"
   or: "sau"
   password: "Parola"
@@ -497,7 +501,7 @@ ro:
       edit_my_profile: "Editează profilul meu"
       gender: "gen"
       in_aspects: "în aspecte"
-      location: "location"
+      location: "locaţie"
       remove_contact: "Elimină contactul"
       remove_from: "Elimini pe %{name} din %{aspect}?"
     show: 
@@ -507,19 +511,19 @@ ro:
       mention: "Mention"
       message: "Message"
       not_connected: "You are not connected with this person"
-      recent_posts: "Recent Posts"
+      recent_posts: "Publicări Recente"
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
-      see_all: "See all"
+      see_all: "Vezi tot"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     sub_header: 
       add_some: "add some"
-      edit: "edit"
+      edit: "editare"
       you_have_no_tags: "you have no tags!"
     two: "%{count} people"
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "Ne pare rău, nu am putut găsi %{handle}."
     zero: "no people"
   photos: 
     comment_email_subject: "%{name}'s photo"
@@ -537,8 +541,8 @@ ro:
       post_it: "postează!"
     new_photo: 
       empty: "{file} is empty, please select files again without it."
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      invalid_ext: "{file} are o extensie invalidă. Doar extensiile {extensions} sunt permise."
+      size_error: "{file} este prea mare, mărimea maximă a unui fişier este {sizeLimit}."
     new_profile_photo: 
       or_select_one: "sau selectaţi una din cele existente in albumul"
       upload: "Încarcă o fotografie de profil nouă!"
@@ -548,7 +552,7 @@ ro:
       collection_permalink: "collection permalink"
       delete_photo: "Șterge Fotografie"
       edit: "editează "
-      edit_delete_photo: "Edit photo description / delete photo"
+      edit_delete_photo: "Editează descrierea imaginii / şterge imaginea"
       make_profile_photo: "Setează ca fotografie de profil"
       show_original_post: "Show original post"
       update_photo: "Actualizează fotografia"
@@ -561,7 +565,7 @@ ro:
       see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
   posts: 
     show: 
-      destroy: "Delete"
+      destroy: "Şterge"
       not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   previous: "anterioare"
@@ -570,13 +574,13 @@ ro:
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Editează profil"
-      first_name: "First name"
-      last_name: "Last name"
-      update_profile: "Update Profile"
+      first_name: "Numele mic"
+      last_name: "Numele de familie"
+      update_profile: "Actualizează Profil"
       your_bio: "Your bio"
       your_birthday: "Ziua ta de naştere"
-      your_gender: "Your gender"
-      your_location: "Your location"
+      your_gender: "Sexul tău"
+      your_location: "Locaţia dvs"
       your_name: "Numele tău "
       your_photo: "Poza ta"
       your_private_profile: "Your private profile"
@@ -584,7 +588,7 @@ ro:
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
-      failed: "Failed to update profile"
+      failed: "Eşuare la actualizarea profilului"
       updated: "Profil updatat"
   public: "Public"
   reactions: 
@@ -595,7 +599,7 @@ ro:
     two: "%{count} reactions"
     zero: "0 reactions"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "Ȋnscrierile sunt ȋnchise pe acest pod Diaspora."
     create: 
       success: "Bun venit pe Diaspora!"
     edit: 
@@ -607,15 +611,15 @@ ro:
       update: "Actualizează"
     new: 
       create_my_account: "Create my account"
-      enter_email: "Enter an e-mail"
+      enter_email: "Introduceţi un e-mail"
       enter_password: "Introdu o parolă"
       enter_password_again: "Introduce aceeaşi parolă ca şi înainte"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      enter_username: "Selectează un nume de utilizator (doar litere, numere si caractere underscore)"
       join_the_movement: "Join the movement!"
       sign_up_message: "Social Networking with a <3"
   requests: 
     create: 
-      sending: "Sending..."
+      sending: "Trimitere..."
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Vă rugăm să selectaţi un aspect!"
@@ -623,12 +627,12 @@ ro:
       success: "Acum sunteţi prieteni."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
+        few: "%{count} de cereri noi!"
+        many: "%{count} de cereri noi!"
+        one: "cerere nouă!"
         other: "%{count} new requests!"
-        two: "%{count} new requests!"
-        zero: "no new requests"
+        two: "%{count} cereri noi!"
+        zero: "nicio cerere nouă"
     manage_aspect_contacts: 
       existing: "Contactele existente"
       manage_within: "Manage contacts within"
@@ -663,13 +667,13 @@ ro:
       error: "there was an error connecting that service"
     finder: 
       no_friends: "No Facebook friends found."
-      service_friends: "%{service} Friends"
+      service_friends: "%{service} Prieteni"
     index: 
-      connect_to_facebook: "Conectează cu Facebook"
-      connect_to_tumblr: "Connect to Tumblr"
-      connect_to_twitter: "Conectează cu Twitter"
+      connect_to_facebook: "Conectează-te cu Facebook"
+      connect_to_tumblr: "Conectarea la Tumblr"
+      connect_to_twitter: "Conectează-te cu Twitter"
       disconnect: "desconectează"
-      edit_services: "Edit services"
+      edit_services: "Editează servicii"
       logged_in_as: "conectat ca"
       no_services: "You have not connected any services yet."
       really_disconnect: "desconectează %{service}?"
@@ -683,12 +687,12 @@ ro:
   settings: "Setări"
   shared: 
     add_contact: 
-      add_new_contact: "Add a new contact"
+      add_new_contact: "Adaugă un nou contact"
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
+      enter_a_diaspora_username: "Introduceţi numele de utilizator Diaspora :"
       know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      your_diaspora_username_is: "Numele tău de utilizator Diaspora este: %{diaspora_handle}"
     aspect_dropdown: 
       add_to_aspect: "Add to aspect"
       toggle: 
@@ -731,8 +735,9 @@ ro:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: "Publicare..."
       publishing_to: "publishing to: "
       share: "Distribuie"
       share_with: "Share with %{aspect}"
@@ -747,7 +752,7 @@ ro:
       hide_and_mute: "Hide and Mute"
       like: "I like this"
       shared_with: "Shared with: %{aspect_names}"
-      unlike: "Unlike"
+      unlike: "Nu ȋmi place"
       via: "via %{link}"
       viewable_to_anyone: "This post is viewable to anyone on the web"
   status_messages: 
@@ -814,17 +819,17 @@ ro:
       stop_following: "Stop Following #%{tag}"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
+      connect_to_cubbies: "Conectarea la Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
+      daniels_account: "Contul Diaspora a lui Daniel"
       log_in_with_diaspora_is_comming: "Pretty soon, you'll be able to connect to a new application without creating an account separate from your one on Diaspora."
       love_to_try: "We'd love for you to try it out."
       making_the_connection: "Making the Connection"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
+      sign_up_today: "Ȋnregistrează-te astăzi!"
       typical_userpage: "A typical cubbi.es userpage"
       via: "(via %{link})"
-      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 este prima aplicaţie Diaspora din lume.  Este cea mai bună metodă de a colecta imagini online."
   undo: "Undo?"
   username: "Nume de utilizator"
   users: 
@@ -859,7 +864,7 @@ ro:
       started_sharing: "...someone starts sharing with you?"
       stream_preferences: "Stream Preferences"
       your_email: "E-mailul tău"
-      your_handle: "Identificatorul tau pe Diaspora"
+      your_handle: "Identificatorul tău pe Diaspora"
     getting_started: 
       awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
       community_welcome: "Diaspora's community is happy to have you aboard!"
@@ -883,9 +888,9 @@ ro:
     update: 
       email_notifications_changed: "Language Change Failed"
       language_changed: "Limba schimbată"
-      language_not_changed: "Nu sa putut modifica limba"
+      language_not_changed: "Nu s-a putut modifica limba"
       password_changed: "S-a modificat parola"
-      password_not_changed: "Nu sa putut schimba parola"
+      password_not_changed: "Nu s-a putut schimba parola"
       settings_not_updated: "Settings update failed"
       settings_updated: "Settings updated"
       unconfirmed_email_changed: "E-Mail Changed. Needs activation."
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 4050d2be5..bef013fe5 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -105,16 +105,19 @@ ru:
       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}: создающиеся сообществом руководства, инструкции и новости"
-      introduce_yourself: "Это ваш поток. Ныряйте и осваивайтесь."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+      introduce_yourself: "Это ваш поток. Ныряйте и осваивайтесь здесь."
       keep_us_running: "Помогите %{pod} работать быстро — купите нашим серверам дозу кофе, сделав ежемесячное пожертвование!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Контакты отсутствуют"
       no_tags: "+ Найти метку"
       people_sharing_with_you: "Люди делятся с вами"
@@ -288,6 +291,7 @@ ru:
       comma_seperated_plz: "Вы можете ввести несколько адресов электронной почты через запятую."
       if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
       invite_someone_to_join: "Пригласить кого-либо в Диаспору!"
+      language: "Language"
       personal_message: "Личное сообщение"
       resend: "Ещё раз послать"
       send_an_invitation: "Отправить приглашение"
@@ -731,6 +735,7 @@ ru:
       new_user_prefill: 
         hello: "Привет всем, я тут #%{new_user_tag}."
         i_like: "Я интересуюсь %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка..."
       publishing_to: "публикация в:"
@@ -742,7 +747,7 @@ ru:
       reshare: "Поделиться повторно"
     stream_element: 
       connect_to_comment: "Подключитесь к этому пользователю, чтобы комментировать его записи"
-      currently_unavailable: "комментирование сейчас недоступно"
+      currently_unavailable: "комментирование недоступно"
       dislike: "Не нравится"
       hide_and_mute: "Скрыть и отключить уведомления"
       like: "Мне нравится"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 27f306921..f41719aa1 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -105,16 +105,19 @@ sk:
       help: 
         do_you: "Už:"
         email_feedback: "Napíšte nám svoj názor na %{link}, ak uprednostňujete tento spôsob"
-        feature_and_forum: "%{gs} a %{forum}: Podpora od ostatných používateľov a návrhy na nové funkcie"
         feature_suggestion: "&ndash; máte nápad na novú funkciu %{link}?"
         find_a_bug: "&ndash; ste našli chybu %{link}?"
         have_a_question: "&ndash; máte otázku %{link}?"
         here_to_help: "Komunita Diaspory je tu!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       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"
@@ -288,6 +291,7 @@ sk:
       comma_seperated_plz: "Môžete vložiť viacero adries; oddeľte ich čiarkou."
       if_they_accept_info: "Po odsúhlasení budú pozvaní používatelia pridaní do príslušnej kategórie."
       invite_someone_to_join: "Pozvite niekoho na Diasporu*!"
+      language: "Language"
       personal_message: "Súkromná správa"
       resend: "Preposlať"
       send_an_invitation: "Poslať pozvánku"
@@ -731,6 +735,7 @@ sk:
       new_user_prefill: 
         hello: "Hej, všetci, Som #%{new_user_tag}. "
         i_like: "Zaujíma ma %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Poslať správu na %{aspect}"
       posting: "Posiela sa..."
       publishing_to: "Publikuje sa na: "
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index b6f7d277e..76d7efb44 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -105,16 +105,19 @@ sq:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "No tags"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ sq:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Send an invitation"
@@ -731,6 +735,7 @@ sq:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 118f54341..f53b1ac10 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -105,16 +105,19 @@ sv:
       help: 
         do_you: "Har du:"
         email_feedback: "%{link} din feedback, om du föredrar det"
-        feature_and_forum: "%{gs} & %{forum}: Support ifrån communityn och förslag till funktioner"
         feature_suggestion: "... ett %{link} förslag?"
         find_a_bug: "... hittat en %{link}?"
         have_a_question: "... en %{link}?"
         here_to_help: "Diaspora communityn finns här!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Inga kontakter"
       no_tags: "+ Hitta en tag att följa"
       people_sharing_with_you: "Personer som delar med dig"
@@ -288,6 +291,7 @@ sv:
       comma_seperated_plz: "Du kan ange flera e-postadresser separerade av kommatecken."
       if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
       invite_someone_to_join: "Bjud in en vän till Diaspora!"
+      language: "Language"
       personal_message: "Personligt meddelande"
       resend: "Skicka igen"
       send_an_invitation: "Skicka en inbjudan"
@@ -446,7 +450,7 @@ sv:
     email_sent_by_diaspora: "Detta e-mail har skickats av Diaspora. Vill du inte har några mer liknade e-mail,"
     hello: "Hej %{name}!"
     liked: 
-      liked: "%{name} har precis gillat ditt inlägg "
+      liked: "%{name} gillar ditt inlägg "
       view_post: "Se inlägg >"
     mentioned: 
       mentioned: "nämnde dig i ett inlägg:"
@@ -731,6 +735,7 @@ sv:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
       publishing_to: "publicerar till: "
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index b18f42ae8..0f2a75bc2 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -105,16 +105,19 @@ tr:
       help: 
         do_you: "Do you:"
         email_feedback: "%{link} your feedback, if you prefer"
-        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ı?"
         here_to_help: "Diaspora topluluğu olarak yardım etmek için buradayız!"
         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"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Kişi yok"
       no_tags: "+ Takip etmek için bir etiket bul"
       people_sharing_with_you: "Seninle paylaşımda bulunanlar"
@@ -127,7 +130,7 @@ tr:
       your_aspects: "Yönlerin"
     many: "%{count} yön"
     move_contact: 
-      error: "Kontak taşıma problemi: %{inspect}"
+      error: "Kişi taşıma problemi: %{inspect}"
       failure: "hata oluştu %{inspect}"
       success: "Kişi yeni yöne taşındı"
     new: 
@@ -286,8 +289,9 @@ tr:
       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: "kabul ederlerse, 'aspect' ine eklenecekler ???"
+      if_they_accept_info: "kabul ederseler, yönünüze eklenecekler."
       invite_someone_to_join: "Diaspora'ya birilerini davet et!"
+      language: "Language"
       personal_message: "Kişisel mesaj"
       resend: "Tekrar gönder"
       send_an_invitation: "Bir davet yolla"
@@ -731,6 +735,7 @@ tr:
       new_user_prefill: 
         hello: "Hey herkes, Ben #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "%{aspect} yönüne mesaj gönder "
       posting: "Gönderiliyor..."
       publishing_to: "buraya yayınlanıyor:"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 9efc0adee..29d475eee 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -105,16 +105,19 @@ uk:
       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}: посібники, що створюються товариством, інструкції і новини"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "Це ваш потік. Пірнайте і освоюйтеся."
       keep_us_running: "Допоможіть %{pod} працювати швидко - купіть нашим серверам дозу кави, зробивши щомісячне пожертвування!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "Контакти відсутні"
       no_tags: "+ Знайти мітку"
       people_sharing_with_you: "Люди діляться з вами"
@@ -288,6 +291,7 @@ uk:
       comma_seperated_plz: "Ви можете ввести декілька адрес електронної пошти через кому."
       if_they_accept_info: "після згоди з їх боку, вони будуть додані в запропонований вами аспект."
       invite_someone_to_join: "Запросити кого-небудь в Діаспору!"
+      language: "Language"
       personal_message: "Особисте повідомлення"
       resend: "Ще раз послати"
       send_an_invitation: "Відправити запрошення"
@@ -731,6 +735,7 @@ uk:
       new_user_prefill: 
         hello: "Привіт всім, я тут #%{new_user_tag}."
         i_like: "Я цікавлюся %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Опублікувати повідомлення для %{aspect}"
       posting: "Відправка..."
       publishing_to: "публікація в:"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index 3a4842f3d..37e044416 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -105,16 +105,19 @@ ur-PK:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "کوئ رابطہ نہیں"
       no_tags: "پیروی کرنے کے لئے ایک اصطلاح تلاش کریں +"
       people_sharing_with_you: "آپ کے ساتھ اشتراک کرنے والے افراد"
@@ -288,6 +291,7 @@ ur-PK:
       comma_seperated_plz: "You can enter multiple email addresses separated by commas."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Invite someone to join Diaspora!"
+      language: "Language"
       personal_message: "Personal message"
       resend: "Resend"
       send_an_invitation: "Send an invitation"
@@ -731,6 +735,7 @@ ur-PK:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index a0339251c..e2fecf1ca 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -105,16 +105,19 @@ vi:
       help: 
         do_you: "Do you:"
         email_feedback: "%{link} your feedback, if you prefer"
-        feature_and_forum: "%{gs} & %{forum}: Hỗ trợ từ cộng đồng và yêu cầu tính năng"
         feature_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "The Diaspora community is here!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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 and buy servers their coffee fix with a monthly donation!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "No contacts"
       no_tags: "+ Find a tag to follow"
       people_sharing_with_you: "People sharing with you"
@@ -288,6 +291,7 @@ vi:
       comma_seperated_plz: "Bạn có thể nhập nhiều địa chỉ thư điện tử và ngăn cách chúng bằng dấu phẩy."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Mời người khác tham gia Diaspora!"
+      language: "Language"
       personal_message: "Tin nhắn cá nhân"
       resend: "Gửi lại"
       send_an_invitation: "Gửi lời mời"
@@ -731,6 +735,7 @@ vi:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 660fe8c23..a4a59cfc2 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -105,16 +105,19 @@ zh-CN:
       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_suggestion: "... have a %{link} suggestion?"
         find_a_bug: "... find a %{link}?"
         have_a_question: "... have a %{link}?"
         here_to_help: "Diaspora community is here to help!"
         need_help: "Need Help?"
         satisfaction: "%{link}: Community-powered support"
-        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: 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!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "没有任何好友"
       no_tags: "No tags"
       people_sharing_with_you: "与您分享的人"
@@ -288,6 +291,7 @@ zh-CN:
       comma_seperated_plz: "你可以输入多个邮箱，输入多个时以逗号分隔。"
       if_they_accept_info: "如果他们接受，就会自动被加入到您所邀请的视图中。"
       invite_someone_to_join: "邀请好友来加入到Diaspora！"
+      language: "Language"
       personal_message: "个人信息"
       resend: "重寄"
       send_an_invitation: "发送邀请函"
@@ -731,6 +735,7 @@ zh-CN:
       new_user_prefill: 
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "在 %{aspect} 发布讯息"
       posting: "发布中……"
       publishing_to: "发布至："
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 209a828a2..bc3a3a88c 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -105,16 +105,19 @@ zh-TW:
       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 社群就在這裡!"
         need_help: "要幫忙嗎?"
         satisfaction: "%{link}: 社群支援的客服網站"
-        tutorials_and_wiki: "%{tutorial} 和 %{wiki}: 社群支援的新手入門, 操作指南, 以及最新消息"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
       introduce_yourself: "這是你的流水帳. 跳進來介紹你自己吧."
       keep_us_running: "為了讓 %{pod} 高速奔馳, 用每月捐款來提供些咖啡存量給我們的伺服器吧!"
+      new_here: 
+        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        learn_more: "Learn more"
+        title: "Welcome New Users"
       no_contacts: "沒有任何聯絡人"
       no_tags: "+ 找個標籤來追蹤"
       people_sharing_with_you: "跟你分享的人"
@@ -288,6 +291,7 @@ zh-TW:
       comma_seperated_plz: "你可以輸入多個電子信箱, 只要以逗號分隔即可."
       if_they_accept_info: "如果他們接受, 就會被加入至你所邀請的面向中."
       invite_someone_to_join: "邀請某人來加入 Diaspora!"
+      language: "Language"
       personal_message: "個人訊息"
       resend: "重寄"
       send_an_invitation: "寄出邀請函"
@@ -731,6 +735,7 @@ zh-TW:
       new_user_prefill: 
         hello: "大家好, 我是 #%{new_user_tag}. "
         i_like: "我對 %{tags} 有興趣."
+        invited_by: "Thanks for the invite, "
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
       publishing_to: "發表至: "
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index 24f61dd51..853b69990 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -31,7 +31,7 @@ bg:
     getting_started: 
       alright_ill_wait: "Добре, ще изчакам."
       hey: "Здравейте, {{name}}!"
-      no_tags: "Не следите нито една марка!  Желаете ли да продължите въпрекит това?"
+      no_tags: "Не следите нито една марка!  Желаете ли да продължите въпреки това?"
       preparing_your_stream: "Вашият персонализиран поток се подготвя..."
     infinite_scroll: 
       no_more: "Няма повече публикации."
diff --git a/config/locales/javascript/javascript.cy.yml b/config/locales/javascript/javascript.cy.yml
index f6aee2549..51f07a9a0 100644
--- a/config/locales/javascript/javascript.cy.yml
+++ b/config/locales/javascript/javascript.cy.yml
@@ -7,21 +7,21 @@ cy:
   javascripts: 
     aspect_dropdown: 
       add_to_aspect: "Ychwanegu cysylltiad"
-      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}}."
+      all_aspects: "Agweddau i gŷd"
+      select_aspects: "Dewis agweddau"
+      started_sharing_with: "Rydych chi'n rhannu gyda {{name}}!"
+      stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda {{name}}."
       toggle: 
-        few: "Yn {{count}} aspectiau"
-        many: "Yn {{count}} aspectiau"
-        one: "Yn {{count}} aspect"
-        other: "Yn {{count}} aspectiau"
-        two: "Yn {{count}} aspectiau"
-        zero: "Dewiswch aspectiau"
+        few: "Mewn {{count}} agweddau"
+        many: "Mewn {{count}} agweddau"
+        one: "Mewn {{count}} agwedd"
+        other: "Mewn {{count}} agweddau"
+        two: "Mewn {{count}} agweddau"
+        zero: "Dewiswch agweddau"
     aspect_navigation: 
       deselect_all: "Deselect all"
       no_aspects: "No aspects selected"
-      select_all: "Select all"
+      select_all: "Dewis i gŷd"
     comments: 
       hide: "cuddio sylwadau"
       show: "ddangos sylwadau i gŷd"
@@ -31,12 +31,12 @@ cy:
     getting_started: 
       alright_ill_wait: "O'r gorau - 'dwi'n aros..."
       hey: "Hei, {{name}}!"
-      no_tags: "Hei, nad ydych chi wedi dilyn unrhyw tagiau! Dal ymlaen beth bynnag?"
-      preparing_your_stream: "Preparing your personalized stream..."
+      no_tags: "Hei, dydych chi ddim yn dilyn unrhyw tagiau! Dal ymlaen beth bynnag?"
+      preparing_your_stream: "Preparing your personalised stream..."
     infinite_scroll: 
       no_more: "Dim mwy o swyddi."
     photo_uploader: 
-      looking_good: "OMG, you look awesome!"
+      looking_good: "OMG, rydych chi'n ymddangos yn neis iawn!"
     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"
@@ -48,20 +48,20 @@ cy:
     tags: 
       wasnt_that_interesting: "OK, mae'n debyg nad #{{tagName}}  nid yn ddiddorol iawn..."
     timeago: 
-      day: "a day"
+      day: "diwrnod"
       days: "%d diwrnod"
       hour: "awr"
       hours: "%d awr"
-      minute: "about a minute"
-      minutes: "%d minud"
+      minute: "tua funud"
+      minutes: "%d munud"
       month: "mis"
       months: "%d mis"
       prefixAgo: ""
       prefixFromNow: ""
-      seconds: "less than a minute"
-      suffixAgo: "ago"
-      suffixFromNow: "from now"
-      year: "about a year"
+      seconds: "rhai na munud"
+      suffixAgo: "yn ôl"
+      suffixFromNow: "o hŷd"
+      year: "tua flwyddyn"
       years: "%d blyddynoedd"
     videos: 
       unknown: "Math o fideo anhysbys"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 4e77f1711..6094b1cd8 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -31,16 +31,16 @@ es:
     getting_started: 
       alright_ill_wait: "Está bien, esperaré."
       hey: "¡Hola, {{name}}!"
-      no_tags: "Oye,¡aún no sigues ninguna etiqueta! ¿Quieres continuar de todas formas?"
-      preparing_your_stream: "Preparando sus novedades personales..."
+      no_tags: "¡Eih, aún no sigues ninguna etiqueta! ¿Quieres continuar de todas formas?"
+      preparing_your_stream: "Preparando tus novedades personalizadas..."
     infinite_scroll: 
       no_more: "No hay más publicaciones."
     photo_uploader: 
-      looking_good: "¡La Virgen, está increíble!"
+      looking_good: "¡Guau, estás increíble!"
     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"
-      public: "Público - tu publicación será visible para todos, incluyendo buscadores"
+      at_least_one_aspect: "Debes publicarlo al menos en un aspecto"
+      limited: "Limitado - tu publicación solo es visible para gente con quien compartes"
+      public: "Público - tu publicación es visible para todos, incluyendo buscadores"
     reshares: 
       duplicate: "Que bien, ¿eh? ¡Has compartido esa publicación!"
     search_for: "Buscar a {{name}}"
@@ -52,14 +52,14 @@ es:
       days: "%d días"
       hour: "una hora aproximadamente"
       hours: "%d horas aproximadamente"
-      minute: "un minuto"
+      minute: "1 minuto aproximadamente"
       minutes: "%d minutos"
       month: "un mes aproximadamente"
-      months: "%d meses aproximadamente"
-      prefixAgo: "hace"
-      prefixFromNow: "desde ahora"
+      months: "%d meses"
+      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixFromNow: "javascripts:timeago:prefixFromNow"
       seconds: "menos de un minuto"
-      suffixAgo: ""
+      suffixAgo: "hace"
       suffixFromNow: "desde ahora"
       year: "un año aproximadamente"
       years: "%d años"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index e1eedbd74..5dfbeb7e9 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -46,7 +46,7 @@ fr:
     search_for: "Chercher {{name}}"
     show_more: "Voir plus"
     tags: 
-      wasnt_that_interesting: "D'accord, je suppose que #{{tagName}} n'est pas la seule chose qui vous intéresse..."
+      wasnt_that_interesting: "Ok, je suppose que #{{tagName}} n'est pas la seule chose qui vous intéresse..."
     timeago: 
       day: "environ un jour"
       days: "environ %d jours"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index 2ac75b37b..3f901e248 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -7,8 +7,8 @@ ro:
   javascripts: 
     aspect_dropdown: 
       add_to_aspect: "Adaugă la aspect"
-      all_aspects: "All aspects"
-      select_aspects: "Select aspects"
+      all_aspects: "Toate aspectele"
+      select_aspects: "Selectează aspecte"
       started_sharing_with: "You have started sharing with {{name}}!"
       stopped_sharing_with: "You have stopped sharing with {{name}}."
       toggle: 
@@ -19,17 +19,17 @@ ro:
         two: "In {{count}} aspects"
         zero: "Adaugă la aspect"
     aspect_navigation: 
-      deselect_all: "Deselect all"
-      no_aspects: "No aspects selected"
-      select_all: "Select all"
+      deselect_all: "Deselectează tot"
+      no_aspects: "Niciun aspect selectat"
+      select_all: "Selectează tot"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "ascunde comentariile"
+      show: "arată toate comentarile"
     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."
+      alright_ill_wait: "In regulă, o să aștept."
       hey: "Hey, {{name}}!"
       no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
       preparing_your_stream: "Preparing your personialized stream..."
@@ -44,7 +44,7 @@ ro:
     reshares: 
       duplicate: "You've already reshared that post!"
     search_for: "Caută {{name}}"
-    show_more: "show more"
+    show_more: "arată mai mult"
     tags: 
       wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
     timeago: 
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index df8634ea1..023af62fc 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -9,8 +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}}."
+      started_sharing_with: "Вы начали делиться с {{name}}!"
+      stopped_sharing_with: "Вы перестали делиться с {{name}}."
       toggle: 
         few: "В {{count}} аспектах"
         many: "В {{count}} аспектах"
@@ -29,24 +29,24 @@ ru:
     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..."
+      alright_ill_wait: "Хорошо, я подожду."
+      hey: "Привет, {{name}}!"
+      no_tags: "Вы не следите ни за одной меткой! Все равно продолжить?"
+      preparing_your_stream: "Подготовка вашего личного потока..."
     infinite_scroll: 
       no_more: "Сообщений больше нет."
     photo_uploader: 
-      looking_good: "OMG, you look awesome!"
+      looking_good: "Боже мой, вы выглядите потрясающе!"
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
       limited: "Ограниченная - ваша запись будет видна только указанным вами людям"
       public: "Публичная - ваша запись будет видна всем, включая поисковые системы"
     reshares: 
-      duplicate: "Вы уже поделились этой записью!"
+      duplicate: "Настолько круто, да? Вы уже поделились этой записью!"
     search_for: "Искать {{name}}"
     show_more: "показать больше"
     tags: 
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "OK, видимо, следить за меткой #{{tagName}} было не так уж интересно..."
     timeago: 
       day: "день"
       days: "%d дней[-я]"