updated locales

45 files changed, 305 insertions, 305 deletions

diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 85537a70a..da6c3bf25 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -28,11 +28,11 @@ ar:
         subject: "تعليمات التأكيد"
         you_can_confirm: "يمكنك تأكيد حسابك عبر الرابط التالي"
       hello: "مرحبا %{email}!"
-      invitation: 
-        accept: "قبول الدعوة"
-        ignore: "إذا كنت لا تريد قبول الدعوة, رجاء تجاهل هذه الرسالة"
-        no_account_till: "لن يتم إنشاء حسابك حتى تنقر على الرابط أعلاه وتسجل دخولك"
-        subject: "دعوة من صديق للإنضمام إلى دياسبرا"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", at %{url}, يمكنك قبولها عبر الرابط التالي."
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 59429ea99..6b2cb6779 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -28,11 +28,11 @@ bg:
         subject: "Инструкции за потвърждаване"
         you_can_confirm: "Можете да потвърдите акаунта си чрез линка по-долу:"
       hello: "Здравейте %{email}!"
-      invitation: 
-        accept: "Приеман поканата"
-        ignore: "Ако не желаете да приемете поканата, моля игнорирайте писмото."
-        no_account_till: "Акаунтът няма да бъде създаден докато не посетите връзката по-горе и не се регистрирате."
-        subject: "Поканени сте да се присъедините към Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", на адрес %{url}. Можете да приемете поканата чрез линка по-долу."
         has_invited_you: "%{name} ви кани да се присъедините към Diaspora"
diff --git a/config/locales/devise/devise.br.yml b/config/locales/devise/devise.br.yml
index 8f14b357e..791518ca5 100644
--- a/config/locales/devise/devise.br.yml
+++ b/config/locales/devise/devise.br.yml
@@ -28,11 +28,11 @@ br:
         subject: "Titouroù-kadarnaat"
         you_can_confirm: "Moaien zo deoc'h kadarnaat ho kont gant al liamm dindan:"
       hello: "Demat, %{email}!"
-      invitation: 
-        accept: "Roit ho asant da'r bedadenn"
-        ignore: "M'ho peus ket c'hoant bezañ pedet n'ho peus ket nemet leuskel ar postel-mañ a-gostez."
-        no_account_till: "Ne vo ket krouet ho hont keit ma n'ho po ket kliket war al liamm dindan ha lakaet hoc'h anv."
-        subject: "Pedet oc'h bet da vont davet Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", e %{url}, moaien zo deoc'h asantiñ dre al liamm a zo dindan."
         has_invited_you: "%{name} en deus pedet ac'hanoc'h da vont davet Diaspora"
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 7626cdf5f..e7a006afc 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -28,11 +28,11 @@ cs:
         subject: "Informace o potvrzení"
         you_can_confirm: "Váš účet můžete potvrdit kliknutím na tento odkaz:"
       hello: "Zdravím %{email}!"
-      invitation: 
-        accept: "Potvrdit pozvánku"
-        ignore: "Pokud nechcete potvrdit pozvání, tento e-mail prosím ignorujte."
-        no_account_till: "Pro dokončení registrace klikněte prosím na odkaz uvedený níže."
-        subject: "Byl jste pozván na Diasporu!"
+      invitation_instructions: 
+        accept: "Přijmout pozvání"
+        ignore: "Pokud nechcete přijmout pozvání, prosím ignorujte tento e-mail."
+        no_account_till: "Váš účet nebude vytvořen dokud nepřistoupíte na uvedený odkaz a zaregistrujete se."
+        subject: "Byli jste pozváni na Diasporu!"
       inviters: 
         accept_at: ", na %{url}, akceptujte kliknutím na odkaz."
         has_invited_you: "%{name} Vás pozval na Diasporu"
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 24169fee2..591ac932b 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -28,11 +28,11 @@ cy:
         subject: "Confirmation instructions"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email."
         no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "A friend wants you to join Diaspora!"
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", at %{url}, you can accept it through the link below."
         has_invited_you: "%{name} has invited you to join Diaspora"
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index dde119d25..0c3845589 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -28,11 +28,11 @@ da:
         subject: "Bekræftelsesinstruktioner"
         you_can_confirm: "Du kan bekræfte din konto via nedenstående link:"
       hello: "Hej %{email}!"
-      invitation: 
-        accept: "Acceptér invitation"
-        ignore: "Hvis du ikke ønsker at acceptere invitationen, bedes du ignorere denne e-mail."
-        no_account_till: "Din konto vil ikke blive oprettet før du klikker på linket ovenfor og logger ind."
-        subject: "Du er blevet inviteret til Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", på %{url}, kan du acceptere via linket nedenfor."
         has_invited_you: "%{name} har inviteret dig til Diaspora"
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 6155c34ba..74c7d7b88 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -28,11 +28,11 @@ de:
         subject: "Bestätigung deines Diaspora-Kontos"
         you_can_confirm: "Du kannst dein Konto über den nachfolgenden Link bestätigen:"
       hello: "Hallo %{email}!"
-      invitation: 
-        accept: "Einladung annehmen"
-        ignore: "Wenn du die Einladung nicht annehmen willst, dann ignoriere diese E-Mail."
-        no_account_till: "Dein Konto wird erst erstellt, wenn du dich über den Link registrierst."
-        subject: "Du wurdest zu Diaspora eingeladen!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: "%{url} teilzunehmen. Du kannst die Einladung durch den Link unten annehmen."
         has_invited_you: "%{name} hat dich dazu eingeladen, bei Diaspora auf"
diff --git a/config/locales/devise/devise.el.yml b/config/locales/devise/devise.el.yml
index 6e522d188..a8233900c 100644
--- a/config/locales/devise/devise.el.yml
+++ b/config/locales/devise/devise.el.yml
@@ -28,11 +28,11 @@ el:
         subject: "Οδηγίες επιβεβαίωσης"
         you_can_confirm: "Μπορείτε να επιβεβαιώσετε τον λογαριασμό σας μέσω του παρακάτω συνδέσμου:"
       hello: "Γειά σου %{email}!"
-      invitation: 
-        accept: "Αποδοχή πρόσκλησης"
-        ignore: "Εάν δεν θέλετε να αποδεχθείτε την πρόσκληση, αγνοήστε αυτό το μήνυμα."
-        no_account_till: "Ο λογαριασμός σας δεν θα δημιουργηθεί μέχρι να επισκεφθείτε τον παραπάνω σύνδεσμο και να εγγραφείτε."
-        subject: "Έχετε λάβει πρόσκληση για να γίνετε μέλος του Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", στο %{url}, μπορείτε να το αποδεχτείτε, μέσω του επόμενου συνδέσμου."
         has_invited_you: "Ο χρήστης %{name} σας προσκάλεσε να γίνετε μέλος του Diaspora"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index 2a848f919..f1108fe63 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -28,11 +28,11 @@ en_shaw:
         subject: "𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯 𐑦𐑯𐑕𐑑𐑮𐑳𐑒𐑖𐑩𐑯𐑟"
         you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:"
       hello: "𐑣𐑧𐑤𐑴 %{email}!"
-      invitation: 
-        accept: "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑥𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
-        ignore: "𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
-        no_account_till: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑴𐑯𐑑 𐑚𐑰 𐑒𐑮𐑦𐑱𐑑𐑩𐑛 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑕𐑲𐑯 𐑳𐑐."
-        subject: "𐑿𐑝 𐑚𐑧𐑯 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", 𐑨𐑑 %{url}, 𐑿 𐑒𐑨𐑯 𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑑 𐑔𐑮𐑵 𐑔 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴."
         has_invited_you: "%{name} 𐑣𐑨𐑟 𐑦𐑥𐑝𐑲𐑑𐑩𐑛 𐑿 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
diff --git a/config/locales/devise/devise.eo.yml b/config/locales/devise/devise.eo.yml
index 0a7dc96e2..cd493387f 100644
--- a/config/locales/devise/devise.eo.yml
+++ b/config/locales/devise/devise.eo.yml
@@ -28,11 +28,11 @@ eo:
         subject: "Instrukcioj por konfirmi"
         you_can_confirm: "Vi povas konfirmi vian konton per la suba ligilo:"
       hello: "Saluton, %{email}!"
-      invitation: 
-        accept: "Akcepti inviton"
+      invitation_instructions: 
+        accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email."
         no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "Iu invitis vin aligi al Diaspora!"
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", ĉe %{url}, vi povas akcepti ĝin per la suba ligilo."
         has_invited_you: "%{name} invitis vin aliĝi al Diaspora"
diff --git a/config/locales/devise/devise.es-CL.yml b/config/locales/devise/devise.es-CL.yml
index 64080b40f..575a50f64 100644
--- a/config/locales/devise/devise.es-CL.yml
+++ b/config/locales/devise/devise.es-CL.yml
@@ -28,11 +28,11 @@ es-CL:
         subject: "Instrucciones de confirmación"
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
-      invitation: 
-        accept: "Aceptar la invitación"
-        ignore: "Si no quieres aceptar la invitación, por favor, ignora este correo."
-        no_account_till: "Tu cuenta no será creada hasta que accedas al enlace de arriba y te registres."
-        subject: "¡Has sido invitado a unirte a Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", en %{url}, puedes aceptar a través del siguiente enlace."
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index f13b9096f..3d297013a 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -28,11 +28,11 @@ es:
         subject: "Instrucciones de confirmación"
         you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
-      invitation: 
-        accept: "Aceptar la invitación"
-        ignore: "Si no deseas aceptar la invitación, por favor ignora este mensaje."
-        no_account_till: "Tu cuenta no será creada hasta que accedas al enlace de arriba y te identifiques."
-        subject: "¡Has sido invitado a participar en Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", en %{url}, puedes aceptar en el siguiente enlace."
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index d063250a5..ffd0e3238 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -28,11 +28,11 @@ eu:
         subject: "Baieztapen argibideak"
         you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:"
       hello: "Kaixo %{email}!"
-      invitation: 
-        accept: "Gonbidapena onartu"
-        ignore: "Ez baduzu gonbidapena onartu nahi, gutxietsi mezu hau."
-        no_account_till: "Zure kontua ez da sortua izango goiko esteka jarraitzen duzun arte."
-        subject: "Diasporara gonbidatua izan zara!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ",%{url}(e)n, onartu dezakezu honako estekaren bidez."
         has_invited_you: "%{name} Diasporara gonbidatu zaitu"
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 31b69de52..ac546c105 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -28,11 +28,11 @@ fi:
         subject: "Vahvistamisohjeet"
         you_can_confirm: "Voit vahvistaa käyttäjätilisi alla olevan linkin kautta:"
       hello: "Hei, %{email}!"
-      invitation: 
-        accept: "Hyväksy kutsu"
-        ignore: "Jos et halua hyväksyä kutsua, voit jättää tämän viestin huomioimatta."
-        no_account_till: "Käyttäjätilisi luodaan vasta, kun rekisteröidyt yllä olevan linkin kautta. "
-        subject: "Sinut on kutsuttu käyttämään Diasporaa!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", osoitteessa %{url}, voit hyväksyä sen alla olevan linkin kautta."
         has_invited_you: "%{name} on kutsunut sinut liittymään Diasporaan"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 657e43cdf..4d241ee34 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -28,11 +28,11 @@ fr:
         subject: "Instructions de confirmation"
         you_can_confirm: "Vous pouvez confirmer votre compte à travers le lien ci-dessous :"
       hello: "Bonjour %{email} !"
-      invitation: 
-        accept: "Accepter l'invitation"
-        ignore: "Si vous ne souhaitez pas accepter l'invitation, merci d'ignorer cet e-mail."
-        no_account_till: "Votre compte ne sera pas créé avant que vous ne vous inscriviez en accédant au lien ci-dessus."
-        subject: "Vous avez été invité à rejoindre Diaspora !"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", sur %{url}, vous pouvez accepter à travers le lien ci-dessous."
         has_invited_you: "%{name} vous a invité à rejoindre Diaspora"
diff --git a/config/locales/devise/devise.ga.yml b/config/locales/devise/devise.ga.yml
index c4dc09bf8..aa2bde530 100644
--- a/config/locales/devise/devise.ga.yml
+++ b/config/locales/devise/devise.ga.yml
@@ -28,11 +28,11 @@ ga:
         subject: "Treoiracha deimhniú"
         you_can_confirm: "Tá tú ábalta do cúntas a deimhniú tríd an nasc faoi:"
       hello: "Haileo %{email}!"
-      invitation: 
-        accept: "Ghlacadh leis an cuireadh"
+      invitation_instructions: 
+        accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Ní bheidh do cúntas déanta roimh a rochtain tú an nasc thar agus síníonn tú suas."
-        subject: "Tá cuireadh seolta chugat chun páirt a ghlacadh i Diaspora!"
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", ag %{url}, is féidir leat ghlacadh leis an cuireadh tríd an nasc faoi."
         has_invited_you: "Tá %{name} tar éis cuireadh a sheoladh chugat chun páirt a ghlacadh i Diaspora"
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index ec4347e46..ae8d077ec 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -28,11 +28,11 @@ he:
         subject: "הנחיות לאימות"
         you_can_confirm: "באפשרותך לאמת את החשבון שלך באמצעות הקישור שלהלן:"
       hello: "שלום %{email}!"
-      invitation: 
-        accept: "קבלת ההזמנה"
-        ignore: "אם אין ברצונך לאשר את ההזמנה ניתן להתעלם מהודעה זו."
-        no_account_till: "החשבון שלך לא ייווצר עד הרישום דרך קישור זה."
-        subject: "הוזמנת על ידי אחד מחבריך להצטרף לדיאספורה!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", בכתובת %{url}, ניתן לקבל אותה דרך הקישור שלהלן."
         has_invited_you: "התקבלה הזמנה מאת %{name} להצטרף לדיאספורה"
diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index bddaef793..9a2299c3e 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -28,11 +28,11 @@ hu:
         subject: "Megerősítési utasítások"
         you_can_confirm: "Megerősítheted a fiókod ezen a linken keresztül:"
       hello: "Szia %{email}!"
-      invitation: 
-        accept: "Elfogadom a meghívót"
-        ignore: "Ha nem akarod elfogadni a meghívást, hagyd figyelmen kívül ezt a levelet."
-        no_account_till: "A fiókod addig nem hozható létre, amíg nem regisztrálsz a fenti linken keresztül."
-        subject: "Meghívtak, hogy csatlakozz a Diaspora* közösségi hálózathoz!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", ezen a linken keresztül tudod elfogadni: %{url}."
         has_invited_you: "%{name} meghívott téged, hogy csatlakozz a Diaspora* közösségi hálózathoz"
diff --git a/config/locales/devise/devise.id.yml b/config/locales/devise/devise.id.yml
index 6f6a5ca89..4ef7428d1 100644
--- a/config/locales/devise/devise.id.yml
+++ b/config/locales/devise/devise.id.yml
@@ -28,11 +28,11 @@ id:
         subject: "Confirmation instructions"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email."
         no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "A friend wants you to join Diaspora!"
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", at %{url}, you can accept it through the link below."
         has_invited_you: "%{name} has invited you to join Diaspora"
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 1a7017d04..51f70976d 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -28,11 +28,11 @@ is:
         subject: "Staðfestingarleiðbeiningar"
         you_can_confirm: "Þú getur staðfest aðgang þinn með því að elta hlekkinn hér fyrir neðan:"
       hello: "Halló %{email}!"
-      invitation: 
-        accept: "Taka boðinu"
-        ignore: "Ef þú vilt ekki taka boðinu, vinsamlegast gefðu þá þessum tölvupósti engan gaum."
-        no_account_till: "Aðgangur þinn mun ekki verða búinn til fyrr en þú eltir hlekkinn hér fyrir ofan og skráir þig."
-        subject: "Þér hefur verið boðið að taka þátt í Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", Á% {url}, getur þú samþykkt það í gegnum hlekkinn hér fyrir neðan."
         has_invited_you: "%{name} hefur boðið þér að taka þátt í Díaspora"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index efdc7978c..751994764 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -28,10 +28,10 @@ it:
         subject: "Istruzioni di conferma"
         you_can_confirm: "Puoi confermare il tuo account attraverso il link sottostante:"
       hello: "Ciao %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Accetta l'invito"
-        ignore: "se non vuoi accettare l' invito, perfavore ignora questa email."
-        no_account_till: "Il tuo account non sarà creato finchè non cliccherai sul link qui sopra e ti registrerai."
+        ignore: "Se non vuoi accettare l'invito, perfavore ignora questa email."
+        no_account_till: "Il tuo account non sarà creato finché non cliccherai sul link qui sopra e ti registrerai."
         subject: "Hai un invito per iscriverti a Diaspora!"
       inviters: 
         accept_at: ", a %{url}, lo puoi accettare tramite il link sottostante."
diff --git a/config/locales/devise/devise.ja.yml b/config/locales/devise/devise.ja.yml
index 53feed14c..01dda7353 100644
--- a/config/locales/devise/devise.ja.yml
+++ b/config/locales/devise/devise.ja.yml
@@ -28,11 +28,11 @@ ja:
         subject: "認証手続き"
         you_can_confirm: "次のリンクからアカウントが認証できます。"
       hello: "%{email}さん、こんにちは！"
-      invitation: 
-        accept: "招待を承諾する"
-        ignore: "招待にご興味がない場合は、このメールを無視してください。"
-        no_account_till: "上のリンクへアクセスして新規登録するまではアカウントが作成されません。"
-        subject: "ダイアスポラへ参加しませんか！"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: "、%{url}。下のリンクから承諾できます。"
         has_invited_you: "%{name}さんはダイアスポラへの参加を招待しています。"
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 37cdfc8c2..67f0c977a 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -28,7 +28,7 @@ ko:
         subject: "확인 안내"
         you_can_confirm: "아래 링크로 계정을 확인할 수 있습니다:"
       hello: "%{email} 님 환영합니다!"
-      invitation: 
+      invitation_instructions: 
         accept: "초대 수락하기"
         ignore: "초대를 수락하지 않으려면 이 메일을 무시하세요."
         no_account_till: "계정은 가입하지 않는 한 만들어지지 않습니다."
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 385732cb3..3b9fca46f 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -28,11 +28,11 @@ lt:
         subject: "Patvirtinimo nurodymai"
         you_can_confirm: "Paskyrą galima patvirtinti žemiau pateikta nuoroda:"
       hello: "Labas, %{email}!"
-      invitation: 
-        accept: "Priimti pakvietimą"
-        ignore: "Jei nenori priimti pakvietimo, ignoruok šį laišką."
-        no_account_till: "Paskyra nebus sukurta, kol nebus pasinaudota aukščiau esančia nuoroda ir užregistruotas naujas vartotojas."
-        subject: "Draugas nori prisijungti prie Diasporos!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", adresu %{url} kurį galima priimti naudojantis žemiau pateikta nuoroda."
         has_invited_you: "%{name} kviečia prisijungti prie Diasporos"
diff --git a/config/locales/devise/devise.mk.yml b/config/locales/devise/devise.mk.yml
index 3672a0f2f..41e2a3ff7 100644
--- a/config/locales/devise/devise.mk.yml
+++ b/config/locales/devise/devise.mk.yml
@@ -28,11 +28,11 @@ mk:
         subject: "Инструкции за потврдување"
         you_can_confirm: "Можете да ја потврдите вашата корисничка сметка на долниот линк:"
       hello: "Здраво %{email}!"
-      invitation: 
-        accept: "Прифати покана"
-        ignore: "Ако не сакате да ја прифатите поканата, ве молиме игнорирајте го овој е-маил."
-        no_account_till: "Вашата корисничка сметка нема да биде креирана пред да се регистрирате на горниот линк."
-        subject: "Поканети сте за приклучување кон Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", на %{url}, можете да ја прифатите преку линкот подолу."
         has_invited_you: "%{name} ве покани да се приклучите кон Diaspora"
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index 8cd021810..f604752dc 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -28,11 +28,11 @@ nb:
         subject: "Confirmation instructions"
         you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:"
       hello: "Hei %{email}!"
-      invitation: 
-        accept: "Godta invitasjon"
-        ignore: "Hvis du ikke vil godta invitasjonen, kan du overse denne e-posten."
-        no_account_till: "Kontoen din vil ikke bli opprettet før du åpner linken ovenfor og registrerer deg."
-        subject: "A friend wants you to join Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", at %{url}, you can accept it through the link below."
         has_invited_you: "%{name} har invitert deg til å bli med på Diaspora"
diff --git a/config/locales/devise/devise.nl.yml b/config/locales/devise/devise.nl.yml
index 4235abca2..1795751f3 100644
--- a/config/locales/devise/devise.nl.yml
+++ b/config/locales/devise/devise.nl.yml
@@ -28,11 +28,11 @@ nl:
         subject: "Bevestigingsinstructies"
         you_can_confirm: "Je kunt je account bevestigen via onderstaande link:"
       hello: "Hallo %{email}!"
-      invitation: 
-        accept: "Accepteer uitnodiging"
-        ignore: "Indien je de uitnodiging niet wilt accepteren kun je deze mail gewoon negeren."
-        no_account_till: "Je account zal niet worden aangemaakt totdat je jezelf via bovenstaande link registreert."
-        subject: "Je bent uitgenodigd om lid te worden van Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", op %{url}, je kunt het accepteren via onderstaande link."
         has_invited_you: "%{name} heeft je uitgenodigd om lid te worden van Diaspora"
diff --git a/config/locales/devise/devise.pa.yml b/config/locales/devise/devise.pa.yml
index f517962e8..de485a90e 100644
--- a/config/locales/devise/devise.pa.yml
+++ b/config/locales/devise/devise.pa.yml
@@ -28,7 +28,7 @@ pa:
         subject: "ਪੁਸ਼ਟੀ ਹਦਾਇਤਾਂ"
         you_can_confirm: "You can confirm your account through the link below:"
       hello: "Hello %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Accept invitation"
         ignore: "If you don't want to accept the invitation, please ignore this email."
         no_account_till: "Your account won't be created until you access the link above and sign up."
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 311e6604d..d804b142c 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -28,11 +28,11 @@ pl:
         subject: "Instrukcje aktywacji"
         you_can_confirm: "Możesz aktywować swoje konto klikając poniższy odnośnik:"
       hello: "Cześć %{email}!"
-      invitation: 
-        accept: "Zaakceptuj zaproszenie"
-        ignore: "Jeśli nie chcesz zaakceptować zaproszenia, zignoruj ten e-mail."
-        no_account_till: "Twoje konto nie zostanie założone dopóki nie klikniesz odnośnika powyżej i nie zarejestrujesz się."
-        subject: "Masz zaproszenie do Diaspory!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", pod adresem %{url}, możesz przyjąć zaproszenie używając poniższego odnośnika."
         has_invited_you: "Użytkownik %{name} zaprosił Cię do Diaspory"
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 0129548b4..3659e9040 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -28,11 +28,11 @@ pt-BR:
         subject: "Instruções para confirmação"
         you_can_confirm: "Você pode confirmar a sua conta através do link abaixo:"
       hello: "Oi %{email}!"
-      invitation: 
-        accept: "Aceitar o convite"
-        ignore: "Se você não quer aceitar o convite, por favor ignore este email."
-        no_account_till: "Você somente criará sua conta ao acessar o link acima e se cadastrar."
-        subject: "Um amigo quer que você se junte à Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", no endereço %{url}. Para aceitá-lo, basta acessar o link abaixo."
         has_invited_you: "%{name} lhe convidou para entrar na Diaspora"
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index ad5f66253..2ab7b3e40 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -6,90 +6,90 @@
 pt-PT: 
   devise: 
     confirmations: 
-      confirmed: "A tua conta foi confirmada com sucesso. Estás online."
+      confirmed: "A sua conta foi confirmada com sucesso. A sessão foi iniciada."
       new: 
         resend_confirmation: "Reenviar instruções de confirmação"
-      send_instructions: "Vais receber um email com instruções sobre como confirmar a tua conta dentro de alguns minutos."
+      send_instructions: "Receberá um email com instruções sobre como confirmar a sua conta dentro de alguns minutos."
     failure: 
-      inactive: "A tua conta ainda não foi activada."
-      invalid: "Endereço de correio ou senha inválida."
-      invalid_token: "Token de autenticação inválido."
-      locked: "A tua conta foi bloqueada."
-      timeout: "A sua sessão expirou, por favor faça login novamente para continuar."
-      unauthenticated: "Faça login ou registe-se antes de continuar."
-      unconfirmed: "Confirma a tua conta antes de continuar."
+      inactive: "A sua conta ainda não foi activada."
+      invalid: "Endereço de email ou senha inválidos."
+      invalid_token: "Código de de autentificação inválido."
+      locked: "A sua conta foi bloqueada."
+      timeout: "A sua sessão expirou, por favor inicie sessão novamente para continuar."
+      unauthenticated: "É necessário iniciar sessão ou registar-se antes de continuar."
+      unconfirmed: "Precisa confirmar a sua conta antes de continuar."
     invitations: 
-      invitation_token_invalid: "O código de convite que introduziste não é válido!"
-      send_instructions: "O teu convite foi enviado."
-      updated: "A tua senha foi definida com sucesso. Estás online."
+      invitation_token_invalid: "O código de convite que introduziu não é válido!"
+      send_instructions: "O seu convite foi enviado."
+      updated: "A sua palavra-passe foi definida com sucesso. A sessão foi iniciada."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmar a minha conta"
         subject: "Instruções de confirmação"
-        you_can_confirm: "Podes confirmar a tua conta através do seguinte link:"
+        you_can_confirm: "Pode confirmar a sua conta através da seguinte hiperligação:"
       hello: "Olá, %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Aceitar o convite"
-        ignore: "Se não pretenderes aceitar este convite, por favor ignora este email."
-        no_account_till: "A tua conta não será criada até que acedas ao link  acima e te registes"
-        subject: "Foste convidado(a) para te juntares ao Diaspora!"
+        ignore: "Se não deseja aceitar o convite, por favor ignore este email."
+        no_account_till: "A sua conta não será criada até que aceda à hiperligação acima e se registe."
+        subject: "Foi convidado para se juntar ao Diaspora!"
       inviters: 
-        accept_at: ", em %{url}, pode aceitar através do seguinte link:"
-        has_invited_you: "%{name} convidou-te para o Diaspora"
-        have_invited_you: "%{names} convidaram-te para o Diaspora"
+        accept_at: ", em %{url}, pode aceitar através da seguinte hiperligação:"
+        has_invited_you: "%{name} convidou-o para se juntar ao Diaspora"
+        have_invited_you: "%{names} convidaram-no para se juntar ao Diaspora"
       reset_password_instructions: 
-        change: "Alterar a minha senha"
-        ignore: "Se não fizeste este pedido, por favor ignora este email."
-        someone_requested: "Alguém pediu para alterar a tua senha, e podes alterar a mesma através do seguinte link"
+        change: "Alterar a minha palavra-passe"
+        ignore: "Se não fez este pedido, por favor ignore este email."
+        someone_requested: "Alguém pediu para alterar a sua palavra-passe, isso pode ser feito através da hiperligação abaixo."
         subject: "Instruções de reposição da palavra-passe"
-        wont_change: "A tua senha não será modificada até clicares no link acima e criares uma nova senha. "
+        wont_change: "A sua palavra-passe não será alterada até que aceda à hiperligação acima e crie uma nova palavra-passe. "
       unlock_instructions: 
-        account_locked: "A tua conta foi bloqueada devido a um número excessivo de tentativas de login falhadas."
-        click_to_unlock: "Clica no link abaixo para desbloquear a tua conta:"
+        account_locked: "A sua conta foi bloqueada devido a um número excessivo de tentativas de inicio de sessão falhadas."
+        click_to_unlock: "Clique na hiperligação abaixo para desbloquear a sua conta:"
         subject: "Instruções de Desbloqueio"
         unlock: "Desbloquear a minha conta"
       welcome: "Bem-vindo(a), %{email}!"
     passwords: 
       edit: 
-        change_password: "Alterar a minha senha"
+        change_password: "Alterar a minha palavra-passe"
       new: 
-        forgot_password: "Esqueceste-te da tua senha?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
-        send_password_instructions: "Enviem-me as instruções para modificar a minha senha"
-      send_instructions: "Vais receber um email com instruções sobre como alterar a senha dentro de alguns minutos."
-      updated: "A tua senha foi alterada com sucesso. Estás online."
+        forgot_password: "Esqueceu-se da sua palavra-passe?"
+        no_account: "Não existe nenhuma conta com este endereço de email.  Se está a esperar por um convite, estamos a distribuí-los tão rapidamente quanto é possível"
+        send_password_instructions: "Enviem-me as instruções para modificar a minha palavra-passe"
+      send_instructions: "Vai receber um email com instruções sobre como alterar a sua palavra-passe dentro de alguns minutos."
+      updated: "A sua palavra-passe foi alterada com sucesso. A sessão foi iniciada."
     registrations: 
-      destroyed: "Adeus! A sua tua foi cancelada com sucesso. Esperamos ver-te de novo brevemente."
-      signed_up: "Registo bem sucedido. Se assim escolheste, uma confirmação foi enviada para o teu email."
-      updated: "Actualizaste a tua conta com sucesso."
+      destroyed: "Adeus! A sua conta foi cancelada com sucesso. Esperamos vê-lo de novo brevemente."
+      signed_up: "Foi registado com sucesso. Caso tenha seleccionado essa opção, uma confirmação foi enviada para o seu endereço de email."
+      updated: "Actualizou a sua conta com sucesso."
     sessions: 
       new: 
-        alpha_software: "Estás preste a utilizar um programa em fase \"alpha\"."
-        bugs_and_feedback: "Tem em atenção que irão ocorrer erros. Encorajamos-te a usar o botão de Feedback na margem direita do teu navegador para reportar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que denunciares."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        login: "Login"
+        alpha_software: "Está prestes a utilizar software em fase \"alfa\"."
+        bugs_and_feedback: "Tenha em conta que irão ocorrer erros. Encorajamo-lo a usar o botão de Feedback na margem direita do seu navegador para relatar quaisquer anomalias! Trabalharemos o mais rapidamente possível para resolver os problemas que relatar."
+        bugs_and_feedback_mobile: "Tenha em conta que irão ocorrer erros.  Encorajamo-lo a relatar quaisquer anomalias!  Trabalharemos tão rapidamente quanto possível para resolver quaisquer problemas que relate."
+        login: "Iniciar sessão"
         modern_browsers: "apenas suporta navegadores modernos."
         password: "Palavra-passe"
-        remember_me: "Recordar-me"
-        sign_in: "Entrar"
-        username: "Nome de utilizador"
-      signed_in: "Login com sucesso."
-      signed_out: "Logout com sucesso."
+        remember_me: "Lembrar-se de mim"
+        sign_in: "Iniciar sessão"
+        username: "Nome de Utilizador"
+      signed_in: "A sessão foi iniciada com sucesso."
+      signed_out: "A sessão foi terminada com sucesso."
     shared: 
       links: 
-        forgot_your_password: "Esqueceste-te da tua senha?"
-        receive_confirmation: "Não recebeste as instruções de confirmação?"
-        receive_unlock: "Não recebeste as instruções de desbloqueio?"
-        sign_in: "Entrar"
-        sign_up: "Regista-te"
+        forgot_your_password: "Esqueceu-se da sua palavra-passe?"
+        receive_confirmation: "Não recebeu as instruções de confirmação?"
+        receive_unlock: "Não recebeu as instruções de desbloqueio?"
+        sign_in: "Iniciar sessão"
+        sign_up: "Registe-se"
         sign_up_closed: "Os registos abertos não estão disponíveis por agora."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Inscreva-se para receber um convite!"
     unlocks: 
       new: 
         resend_unlock: "Reenviar instruções de desbloqueio"
-      send_instructions: "Vais receber uma mensagem sobre como desbloquear a tua conta dentro de alguns minutos."
-      unlocked: "A tua conta foi desbloqueada com sucesso. Estás online."
+      send_instructions: "Receberá um email sobre como desbloquear a sua conta dentro de alguns minutos."
+      unlocked: "A sua conta foi desbloqueada com sucesso. A sessão foi iniciada."
   errors: 
     messages: 
       already_confirmed: "já foi confirmado"
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index b87d1a402..c74514abb 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -28,11 +28,11 @@ ro:
         subject: "Instrucţiuni de confirmare"
         you_can_confirm: "Puteţi confirma contul dvs. prin intermediul link-ul de mai jos:"
       hello: "Bună %{email}!"
-      invitation: 
-        accept: "Acceptă invitaţia"
-        ignore: "Dacă nu doreşti sa accepţi invitaţia, ignorează acest mesaj."
-        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."
-        subject: "Un prieten vrea să te vadă pe Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", la %{url}, puteţi să-l acceptaţi prin link-ul de mai jos"
         has_invited_you: "%{name} v-a invitat pe Diaspora"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index aa2c9c93a..b219db800 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -28,11 +28,11 @@ ru:
         subject: "Инструкции по подтверждению"
         you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке:"
       hello: "Привет %{email}!"
-      invitation: 
-        accept: "Принять приглашение"
-        ignore: "Если вы не хотите принимать приглашение, проигнорируйте это письмо."
-        no_account_till: "Ваш аккаунт будет создан только тогда, если вы подтвердите линк и зарегистрируетесь."
-        subject: "Вас пригласили присоединиться к Диаспоре!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: "вы можете принять его, нажaв на ссылку %{url}"
         has_invited_you: "%{name} приглашает вас присоединиться к Диаспоре"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index d51f746f4..420f694ae 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -28,11 +28,11 @@ sk:
         subject: "Informácie na potvrdenie"
         you_can_confirm: "Váš účet môžete potvrdiť kliknutím na tento odkaz :"
       hello: "Zdravím %{email}!"
-      invitation: 
-        accept: "Potvrdiť pozvánku"
-        ignore: "Ak nechcete potvrdiť pozvanie, tento e-mail prosím ignorujte."
-        no_account_till: "Pre dokončenie registrácie kliknite prosím na odkaz uvedený nižšie."
-        subject: "Boli ste prizvaný k Diaspore!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", na %{url}, akceptujte kliknutím na odkaz."
         has_invited_you: "%{name} Vás prizval k Diaspore"
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index 1861279bc..02c6b1007 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -28,11 +28,11 @@ sl:
         subject: "Navodila za potrditev uporabniškega računa"
         you_can_confirm: "Vaš uporabniški račun lahko potrdite s pomočjo spodnje povezave:"
       hello: "Pozdravljeni %{email}!"
-      invitation: 
-        accept: "Sprejmi povabilo"
-        ignore: "V kolikor ne želite sprejeti povabila, to e-sporočilo vzamite kot brezpredmetno."
-        no_account_till: "S pomočjo zgornje povezave ter vašo prijavo boste ustvarili nov uporabniški račun."
-        subject: "Bili ste povabljeni, da se pridružite v Diasporo!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", na %{url}, lahko potrdite s pomočjo spodnje povezave."
         has_invited_you: "%{name} vas je povabil, da se pridružite v Diasporo"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index 65cf81dae..0c19a27e2 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -28,11 +28,11 @@ sv:
         subject: "Instruktioner för att aktivera ditt konto"
         you_can_confirm: "Klicka på länken nedan för att aktivera ditt konto:"
       hello: "Hej %{email}!"
-      invitation: 
+      invitation_instructions: 
         accept: "Acceptera inbjudan"
-        ignore: "Om du inte vill gå med i Diaspora kan du ignorera detta mail."
-        no_account_till: "Ditt konto kommer inte skapas förrän du klickat på knappen ovan och skapat ett nytt konto."
-        subject: "Du har blivit inbjuden till Diaspora!"
+        ignore: "Om du inte vill acceptera inbjudan, var snäll och ignorera detta email."
+        no_account_till: "Ditt konto kommer inte att skapas förren du besöker länken ovan och registrerar dig."
+        subject: "Du har blivit inbjuden till att gå med i Diaspora!"
       inviters: 
         accept_at: ", du kan acceptera din inbjudan på %{url}."
         has_invited_you: "%{name} vill att du ska gå med i Diaspora"
diff --git a/config/locales/devise/devise.tr.yml b/config/locales/devise/devise.tr.yml
index 1640c0b6f..cddd8f932 100644
--- a/config/locales/devise/devise.tr.yml
+++ b/config/locales/devise/devise.tr.yml
@@ -28,11 +28,11 @@ tr:
         subject: "Doğrulama talimatları"
         you_can_confirm: "Hesabınızı aşağıdaki bağlantı ile doğrulayabilirsiniz:"
       hello: "Merhaba %{email}!"
-      invitation: 
-        accept: "Daveti kabul et"
-        ignore: "Eğer daveti kabul etmek istemiyorsanız, bu e-postayı yoksayın."
-        no_account_till: "Hesabınız siz yukarıdaki bağlantıya tıklayıp üye olmadan oluşturulmayacaktır."
-        subject: "Bir arkadaşınız sizin Diaspora'ya katılmanızı istiyor!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ",  %{url}, aşağıdaki linke tıklayarak bunu kabul edebilirsiniz."
         has_invited_you: "%{name} sizi Diaspora'ya katılmanız için davet etti"
diff --git a/config/locales/devise/devise.zh-CN.yml b/config/locales/devise/devise.zh-CN.yml
index 955c6d3f5..2ea8499d6 100644
--- a/config/locales/devise/devise.zh-CN.yml
+++ b/config/locales/devise/devise.zh-CN.yml
@@ -28,11 +28,11 @@ zh-CN:
         subject: "帐号确认步骤"
         you_can_confirm: "你可以点击下面的链接确认帐号："
       hello: "您好, %{email}!"
-      invitation: 
-        accept: "接受邀请"
-        ignore: "如果您不想接受邀请, 请忽略这封邮件。"
-        no_account_till: "点击以上链接并注册后, 你才能创建帐号。"
-        subject: "您被邀请加入Diaspora！"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: " （%{url}）, 你可以点击下面的链接接收邀请。"
         has_invited_you: "%{name} 邀请您加入Diaspora"
diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 03d864568..fcbe4ad4c 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -28,11 +28,11 @@ zh-TW:
         subject: "確認步驟"
         you_can_confirm: "你可以使用以下連結確認帳號:"
       hello: "你好, %{email}!"
-      invitation: 
-        accept: "接受邀請"
-        ignore: "如果你不想接受邀請, 請忽略這封信件."
-        no_account_till: "在使用以上連結並登記後, 你的帳號才會建立."
-        subject: "有人邀請你加入 Diaspora!"
+      invitation_instructions: 
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
+        subject: "You've been invited to join Diaspora!"
       inviters: 
         accept_at: ", 在 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name} 邀請你加入 Diaspora"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index b330f0d12..2246af5ad 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -615,7 +615,7 @@ cs:
       email_notifications_changed: "Oznámení emailem změněno"
       language_changed: "Jazyk změněn"
       language_not_changed: "Změna jazyka selhala"
-      password_changed: "Heslo změněno"
+      password_changed: "Heslo bylo změněno. Nyní se můžete přihlásit s novým heslem."
       password_not_changed: "Změna hesla selhala"
   webfinger: 
     fetch_failed: "Selhalo načtení webfinger profilu pro %{profile_url}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 9f53fcc1a..9b5b81775 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -615,7 +615,7 @@ eu:
       email_notifications_changed: "E-posta janirazpenak aldatu dituzu"
       language_changed: "Hizkuntza Aldatua"
       language_not_changed: "Hizkuntza aldaketak huts egin du"
-      password_changed: "Pasahitza aldatu duzu"
+      password_changed: "Pasahitza aldatu duzu. Orain zure pasahitz berria erabiliz sar zaitezke."
       password_not_changed: "Pasahitz Aldaketak Huts egin du"
   webfinger: 
     fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 4ecf55a59..e37815cd0 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -123,7 +123,7 @@ it:
     few: "%{count} commenti"
     many: "%{count} commenti"
     new_comment: 
-      comment: "commento"
+      comment: "Commento"
       commenting: "Invio commento in corso..."
     one: "1 commento"
     other: "%{count} commenti"
@@ -236,16 +236,16 @@ it:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "non piace a %{count} persone"
-        many: "non piace a %{count} persone "
-        one: "non piace ad una persona "
-        other: "non piace a %{count} persone"
+        few: "non piace a %{count}"
+        many: "non piace a %{count}"
+        one: "Non piace a %{count}"
+        other: "non piace a %{count}"
         zero: "non piace a zero persone"
       people_like_this: 
-        few: "piace a %{count} persone"
-        many: "piace a %{count} persone"
-        one: "piace ad una persona"
-        other: "piace a %{count} persone"
+        few: "piace a %{count}"
+        many: "Piace a %{count}"
+        one: "piace a %{count}"
+        other: "piace a %{count}"
         zero: "piace a nessuno"
   more: "Altro"
   next: "successivo"
@@ -267,7 +267,7 @@ it:
       and_others: "e altri %{number}"
       mark_all_as_read: "Segna Tutti come Letti"
       notifications: "Notifiche"
-    liked: "has just liked your post"
+    liked: "ha appena apprezzato il tuo post"
     mentioned: "ti ha menzionato in un "
     new_request: "vuole condividere con te."
     post: "post."
@@ -285,9 +285,9 @@ it:
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
-      sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      liked: "%{name} ha appena apprezzato il tuo post: "
+      sign_in: "Accedi per vedere l'elemento"
+      subject: "%{name} ha appena apprezzato il tuo post"
     love: "amore,"
     manage_your_email_settings: "gestisci le tue impostazioni email"
     mentioned: 
@@ -545,7 +545,7 @@ it:
     stream_element: 
       dislike: "Non mi piace"
       like: "Mi piace"
-      unlike: "Unlike"
+      unlike: "Non come"
   status_messages: 
     create: 
       success: "Menzionati con successo: %{names}"
@@ -584,7 +584,7 @@ it:
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
       export_data: "Esporta Dati"
-      liked: "...someone likes your post?"
+      liked: "...a qualcuno piace il tuo post?"
       mentioned: "...sei menzionato in un post?"
       new_password: "Nuova Password"
       private_message: "...hai ricevuto un messaggio privato?"
@@ -615,7 +615,7 @@ it:
       email_notifications_changed: "Notifiche email modificate con successo"
       language_changed: "Lingua Cambiata"
       language_not_changed: "Cambio di lingua fallito"
-      password_changed: "Password Cambiata"
+      password_changed: "Password Cambiata. Ora puoi effettuare l'accesso con la tua nuova password."
       password_not_changed: "Cambio di password fallito"
   webfinger: 
     fetch_failed: "impossibile recuperare il profilo webfinger da %{profile_url}"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 96ebab9cf..4a6d1500e 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -6,8 +6,8 @@
 pt-PT: 
   _comments: "Comentários"
   _home: "Início"
-  _photos: "Fotografias"
-  _services: "Serviços"
+  _photos: "fotografias"
+  _services: "serviços"
   account: "Conta"
   activerecord: 
     errors: 
@@ -32,12 +32,12 @@ pt-PT:
               invalid: "é inválido."
             username: 
               taken: "já existe."
-  ago: "%{time} atrás"
+  ago: "Há %{time} atrás"
   all_aspects: "All aspects"
   application: 
     helper: 
       diaspora_alpha: "DIASPORA* ALPHA"
-      unknown_person: "utilizador(a) desconhecido(a)"
+      unknown_person: "pessoa desconhecida"
       video_title: 
         unknown: "Video sem título	"
   are_you_sure: "Tem a certeza?"
@@ -48,8 +48,8 @@ pt-PT:
       success: "Pessoa removida com sucesso do aspecto."
   aspects: 
     add_to_aspect: 
-      failure: "Falha ao adicionar amigo ao grupo."
-      success: "Amigo adicionado com sucesso ao grupo."
+      failure: "Falha ao adicionar contacto ao aspecto."
+      success: "Contacto adicionado ao aspecto com sucesso."
     aspect_contacts: 
       done_editing: "finalizar edição"
     aspect_stream: 
@@ -59,8 +59,8 @@ pt-PT:
     contacts_not_visible: "Contactos neste aspecto não se verão uns aos outros."
     contacts_visible: "Contactos neste aspecto ver-se-ão uns aos outros."
     create: 
-      failure: "A criação do grupo falhou."
-      success: "O teu novo grupo %{name} foi  criado"
+      failure: "A criação do aspecto falhou."
+      success: "O seu novo aspecto %{name} foi  criado"
     destroy: 
       failure: "%{name} não se encontra vazio e não pôde ser removido."
       success: "%{name} foi removido(a) com sucesso."
@@ -78,17 +78,17 @@ pt-PT:
     few: "%{count} aspectos"
     helper: 
       are_you_sure: "Tem a certeza que deseja eliminar este aspecto?"
-      aspect_not_empty: "Mini-Perfil não está vazio"
+      aspect_not_empty: "Aspecto não vazio"
       remove: "remover"
     index: 
       handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar."
       no_contacts: "Nenhum contacto"
       post_a_message: "post a message >>"
     manage: 
-      add_a_new_aspect: "Adicionar um novo grupo"
+      add_a_new_aspect: "Adicionar um novo aspecto"
       add_a_new_contact: "Adicionar um novo contacto"
       drag_to_add: "Arrasta para adicionar pessoas"
-      manage_aspects: "Gerir Grupos"
+      manage_aspects: "Gerir aspectos"
       no_requests: "Não existem novos pedidos"
       requests: "Pedidos"
     many: "%{count} aspectos"
@@ -100,7 +100,7 @@ pt-PT:
       create: "Criar"
       name: "Nome"
     no_posts_message: 
-      start_talking: "Ainda ninguém disse nada. Dá início à conversa!"
+      start_talking: "Ainda ninguém disse nada. Dê início à conversa!"
     one: "1 aspecto"
     other: "%{count} aspectos"
     seed: 
@@ -110,7 +110,7 @@ pt-PT:
       edit_aspect: "editar Grupo"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
-      success: "O teu grupo, %{name}, foi editado com sucesso."
+      success: "O seu aspecto, %{name}, foi editado com sucesso."
     zero: "nenhum aspecto"
   back: "Voltar"
   bookmarklet: 
@@ -178,7 +178,7 @@ pt-PT:
   email: "Email"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Corrige os seguintes erros e tenta novamente."
+      correct_the_following_errors_and_try_again: "Corrija os seguintes erros e volte a tentar."
       invalid_fields: "Campos Inválidos"
   fill_me_out: "Informa-me"
   hide: "Hide"
@@ -198,13 +198,13 @@ pt-PT:
       tagline_second_half: "com quem desejar."
   invitations: 
     check_token: 
-      not_found: "Token de convite não encontrado"
+      not_found: "Código de convite não encontrado"
     create: 
       already_contacts: "Você já está ligado a esta pessoa"
       already_sent: "Você já convidou esta pessoa."
-      no_more: "Não tens mais convites."
+      no_more: "Não tem mais convites."
       rejected: "Os seguintes endereços de email tiveram problemas: "
-      sent: "Os teu convites foram enviados a:"
+      sent: "Os convites foram enviados a:"
     edit: 
       sign_up: "registar"
     new: 
@@ -212,10 +212,10 @@ pt-PT:
       aspect: "Aspecto"
       comma_seperated_plz: "Podes inserir vários endereços de email separados por vírgulas."
       if_they_accept_info: "se aceitarem, serão adicionados ao aspecto com que os convidou."
-      invite_someone_to_join: "Convida alguém para se juntar ao Diaspora!"
+      invite_someone_to_join: "Convide alguém para se juntar ao Diaspora!"
       personal_message: "Personal message"
       resend: "Reenviar"
-      send_an_invitation: "Envia um convite"
+      send_an_invitation: "Envie um convite"
       send_invitation: "Enviar convite"
       to: "Para"
   layouts: 
@@ -314,8 +314,8 @@ pt-PT:
     thanks: "Obrigado,"
   ok: "OK"
   or: "ou"
-  password: "Palavra-chave"
-  password_confirmation: "Confirmação de palavra-chave"
+  password: "Palavra-passe"
+  password_confirmation: "Confirmação de palavra-passe"
   people: 
     add_contact_small: 
       add_contact_from_tag: "add contact from tag"
@@ -329,15 +329,15 @@ pt-PT:
       couldnt_find_them_send_invite: "Não conseguiu encontrá-los? Envie um convite!"
       no_one_found: "...e ninguém foi encontrado."
       no_results: "Hey! You need to search for something."
-      results_for: "resultados de pesquisa para"
+      results_for: "resultados da pesquisa para"
     many: "%{count} people"
     one: "1 person"
     other: "%{count} people"
     person: 
       add_contact: "adicionar contacto"
       already_connected: "Já está ligado"
-      pending_request: "pedido pendente"
-      thats_you: "És tu!"
+      pending_request: "Pedido pendente"
+      thats_you: "É você!"
     profile_sidebar: 
       bio: "sobre"
       born: "nascido a"
@@ -355,7 +355,7 @@ pt-PT:
       incoming_request: "Tens um pedido desta pessoa"
       mention: "Mention"
       message: "Message"
-      no_posts: "Não existem entradas para mostrar!"
+      no_posts: "Não existem publicações para mostrar!"
       not_connected: "You are not connected with this person"
       recent_posts: "Recent Posts"
       recent_public_posts: "Recent Public Posts"
@@ -379,7 +379,7 @@ pt-PT:
     new: 
       back_to_list: "Voltar à Lista"
       new_photo: "Nova Fotografia"
-      post_it: "Publica!"
+      post_it: "Publique!"
     new_photo: 
       empty: "{file} está vazio, por favor escolhe novamente os ficheiros sem este último."
       invalid_ext: "{file} tem uma extensão inválida. Apenas são permitidas as extensões {extensions}."
@@ -394,14 +394,14 @@ pt-PT:
       delete_photo: "Apagar Fotografia"
       edit: "editar"
       edit_delete_photo: "Editar descrição da fotografia / apagar fotografia"
-      make_profile_photo: "criar foto de perfil"
+      make_profile_photo: "tornar foto de perfil"
       original_post: "Original Post"
       permalink: "permalink"
       update_photo: "Actualizar Fotografia"
       view: "ver"
     update: 
       error: "Falha ao editar a fotografia"
-      notice: "Fotografia adicionada com sucesso."
+      notice: "Fotografia actualizada com sucesso."
   post_visibilites: 
     update: 
       post_hidden: "%{name}'s post has been hidden."
@@ -432,7 +432,7 @@ pt-PT:
   registrations: 
     closed: "Os registos estão encerrados neste pod do Diaspora."
     create: 
-      success: "Juntaste-te ao Diaspora!"
+      success: "Juntou-se ao Diaspora!"
     edit: 
       cancel_my_account: "Cancelar a minha conta"
       edit: "Editar %{name}"
@@ -445,16 +445,16 @@ pt-PT:
       enter_password: "Insira uma senha"
       enter_password_again: "Insira a mesma senha que anteriormente"
       enter_username: "Escolha um nome de utilizador (apenas letras, números e underscores)"
-      sign_up: "Registar"
-      sign_up_for_diaspora: "Regista-te no Diaspora"
+      sign_up: "Registar-se"
+      sign_up_for_diaspora: "Registe-se no Diaspora"
   requests: 
     create: 
       sending: "A enviar..."
       sent: "Você solicitou partilhar com %{name}, que será notificado assim que entrar no Diaspora."
     destroy: 
-      error: "Por favor, escolhe um grupo!"
-      ignore: "Ignorar pedido de contacto."
-      success: "São agora amigos."
+      error: "Por favor, seleccione um aspecto!"
+      ignore: "Pedido de contacto ignorado."
+      success: "Já estão a partilhar."
     helper: 
       new_requests: 
         few: "%{count} novos pedidos!"
@@ -470,9 +470,9 @@ pt-PT:
   search: "Procurar"
   services: 
     create: 
-      success: "Autenticação bem sucedida."
+      success: "Autentificação bem sucedida."
     destroy: 
-      success: "A autenticação foi destruída com sucesso."
+      success: "A autentificação foi destruída com sucesso."
     failure: 
       error: "there was an error connecting that service"
     finder: 
@@ -497,7 +497,7 @@ pt-PT:
     remote_friend: 
       invite: "invite"
       resend: "resend"
-  settings: "Definições "
+  settings: "Definições"
   shared: 
     add_contact: 
       create_request: "Encontrar através do nome de utilizador no Diaspora"
@@ -523,7 +523,7 @@ pt-PT:
     notification: 
       new: "Novo %{type} de %{from}"
     public_explain: 
-      logged_in: "Registado em %{service}"
+      logged_in: "Sessão iniciada em %{service}"
       manage: "Gerir ligações a outros serviços"
       outside: "As mensagens públicas ficarão visíveis a pessoas fora do Diaspora."
       title: "Estás prestes a publicar uma mensagem pública!"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index a63707a26..cfa66042d 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -53,9 +53,9 @@ sv:
     aspect_contacts: 
       done_editing: "dölj"
     aspect_stream: 
-      activity: "aktivitet"
-      post_time: "skickat "
-      sort_by: "sortera efter:"
+      activity: "Aktivitet"
+      post_time: "Skickat "
+      sort_by: "Sortera efter:"
     contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra."
     contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra."
     create: 
@@ -83,7 +83,7 @@ sv:
     index: 
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
       no_contacts: "Inga kontakter"
-      post_a_message: "post a message >>"
+      post_a_message: "skriv ett inlägg >>"
     manage: 
       add_a_new_aspect: "Lägg till en ny aspekt"
       add_a_new_contact: "Lägg till en ny kontakt"
@@ -114,7 +114,7 @@ sv:
     zero: "inga aspekter"
   back: "Tillbaka"
   bookmarklet: 
-    explanation: "%{link} från var som helst genom att lägga till denhär länken som bokmärke."
+    explanation: "%{link} från var som helst genom att lägga till den här länken som bokmärke."
     explanation_link_text: "Posta på Diaspora"
     post_something: "Posta något till Diaspora"
     post_success: "Postat! Stänger!"
@@ -123,7 +123,7 @@ sv:
     few: "%{count} kommentarer"
     many: "%{count} kommentarer"
     new_comment: 
-      comment: "kommentar"
+      comment: "Kommentera"
       commenting: "Kommenterar..."
     one: "1 kommentar"
     other: "%{count} kommentarer"
@@ -229,24 +229,24 @@ sv:
     header: 
       blog: "blogg"
       code: "källkod"
-      login: "logga in"
-      logout: "logga ut"
+      login: "Logga in"
+      logout: "Logga ut"
       profile: "profil"
-      settings: "inställningar"
+      settings: "Inställningar"
   likes: 
     likes: 
       people_dislike_this: 
         few: "%{count} personer ogillade dethär"
         many: "%{count} personer ogillade dethär"
         one: "1 person ogillade dethär"
-        other: "%{count} person ogillade dethär"
-        zero: "inga personer ogillade dethär"
+        other: "%{count} person ogillade det här"
+        zero: "inga personer ogillade det här"
       people_like_this: 
-        few: "%{count} personer gillade dethär"
-        many: "%{count} personer gillade dethär"
-        one: "1 person gillade dethär"
-        other: "%{count} personer gillade dethär"
-        zero: "inga personer gillade dethär"
+        few: "%{count} personer gillade det här"
+        many: "%{count} personer gillade det här"
+        one: "1 person gillade det här"
+        other: "%{count} personer gillade det här"
+        zero: "inga personer gillade det här"
   more: "Mer"
   next: "nästa"
   no_results: "Inga Resultat Funna"
@@ -267,7 +267,7 @@ sv:
       and_others: "och %{number} andra"
       mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
-    liked: "has just liked your post"
+    liked: "har precis gillat ditt inlägg"
     mentioned: "har nämnt dig i deras"
     new_request: "erbjöd sig att dela med dig."
     post: "meddelande"
@@ -285,9 +285,9 @@ sv:
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
+      liked: "%{name} har precis gillat ditt inlägg: "
       sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      subject: "%{name} har precis gillat ditt inlägg"
     love: "hälsningar,"
     manage_your_email_settings: "administrera dina epost-inställningar"
     mentioned: 
@@ -360,7 +360,7 @@ sv:
       recent_posts: "Postat nyligen"
       recent_public_posts: "Senaste publika inlägg"
       return_to_aspects: "Återgå till översikten"
-      see_all: "See all"
+      see_all: "Visa alla"
       start_sharing: "börja dela"
       to_accept_or_ignore: "for att acceptera eller ignorera."
       you_have_no_tags: "du har inga taggar!"
@@ -514,7 +514,7 @@ sv:
     invitations: 
       by_email: "by Emaila"
       dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!"
-      from_facebook: "Från Facebook"
+      from_facebook: "från Facebook"
       invitations_left: "(%{count} kvar)"
       invite_someone: "Bjud in en kontakt"
       invite_your_friends: "Bjud in dina vänner"
@@ -543,9 +543,9 @@ sv:
     reshare: 
       reshare: "Återdela"
     stream_element: 
-      dislike: "Jag ogillar dethär"
-      like: "Jag gillar dethär"
-      unlike: "Unlike"
+      dislike: "Jag ogillar det här"
+      like: "Jag gillar det här"
+      unlike: "Sluta gilla"
   status_messages: 
     create: 
       success: "Lyckades omnämna: %{names}"
@@ -584,7 +584,7 @@ sv:
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
       export_data: "Exportera data"
-      liked: "...someone likes your post?"
+      liked: "...någon gillar ditt inlägg?"
       mentioned: "...du är omnämnd i en post?"
       new_password: "Nytt lösenord"
       private_message: "...du mottar ett privat meddelande?"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index b20179afd..10b718fc9 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -7,7 +7,7 @@ sv:
   javascripts: 
     confirm_dialog: "Är du säker?"
     infinite_scroll: 
-      no_more: "No more posts."
+      no_more: "Inga fler inlägg."
     publisher: 
       at_least_one_aspect: "Du måste publicera till minst en aspekt."
     search_for: "Sök efter {{name}}"
@@ -34,4 +34,4 @@ sv:
       unknown: "Okänd videotyp"
       watch: "Se denhär videon på {{provider}}"
     web_sockets: 
-      disconnected: "The websocket is closed; posts will no longer be streamed live."
+      disconnected: "Webbsockeln är stängd; inlägg kommer inte längre att bli direktstreamade."