diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index eab436eb6f880753a1c5f8a05ccfbc157e58a852..e7d70d31a3956ffff68cd24e5c487acfd7055509 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -44,10 +44,10 @@ ar:
         subject: "Reset password instructions"
         wont_change: "Your password won't change until you access the link above and create a new one."
       unlock_instructions: 
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        account_locked: "لقد تم غلق حسابك وقتيا بسبب الإفراط في محاولات الدخول الفاشلة."
         click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
+        subject: "تعليمات إعادت فتح الحساب"
+        unlock: "إعادت فتح الحساب"
       welcome: "Welcome"
     passwords: 
       edit: 
@@ -66,7 +66,7 @@ ar:
       new: 
         alpha_software: "You are about to use alpha software."
         bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        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."
+        bugs_and_feedback_mobile: "لا تندهش،سوف تواجهكم مشكلة. نحن نشجعكم على استخدام زر ردود الفعل على الجانب الأيمن من المتصفح الخاص بك إلى تسجيل أي مشكلة! سوف نعمل بأسرع ما يمكن لحل  المشاكل الواردةفي التقرير."
         login: "Login"
         modern_browsers: "only supports modern browsers."
         password: "Password"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index da9ec21ddb27de5fe8b9ef315d4e99e63f641aff..6fa71bd2211b5a88f46dee19ed57bc93e5f139cd 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -54,7 +54,7 @@ sv:
         change_password: "Ändra mitt lösenord"
       new: 
         forgot_password: "Glömt ditt lösenord?"
-        no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
+        no_account: "Det finns inget konto med den här mailadressen. Väntar du på en inbjudan så skickar vi ut dem så snart som möjligt."
         send_password_instructions: "Skicka information om hur jag återställer lösenordet"
       send_instructions: "Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter."
       updated: "Ditt lösenord har ändrats och du är inloggad."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 643528c657cb66ea091683065123682270522b98..ddd61b8ed4350b6c67bb32e44e40a72b92aee6da 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -33,6 +33,7 @@ ar:
             username: 
               taken: "is already taken."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ ar:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ ar:
       edit_my_profile: "Editar mi perfil"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ ar:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ ar:
       add_photos: "add photos"
       all: "all"
       all_contacts: "all contacts"
+      click_to_share_with: "Click to share with: "
       make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ ar:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Editar tu perfil"
       finished: "Finished!"
       save_and_continue: "Save and continue"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 60243aa6326810090959c9ffceffa183f239c425..e56f0000e4a434c64fec02b8f01a768779d8ed60 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -33,6 +33,7 @@ cs:
             username: 
               taken: "je již obsazeno."
   ago: "před %{time}"
+  all_aspects: "VÅ¡echny aspekty"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ cs:
     mentioned: "vás zmínil v jejich"
     new_request: "nabídnul vám sdílení."
     post: "zpráva"
+    private_message: "vám poslal zprávu."
     request_accepted: "akceptoval vaši žádost o sdílení."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ cs:
     diaspora: "diaspora email robot"
     hello: "Vítej %{name}!"
     love: "s láskou,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "spravovat nastavení emailu"
     mentioned: 
       mentioned: "zmínil jste v příspěvku:"
       sign_in: "Přihlaste se pro zobrazení."
@@ -302,7 +304,7 @@ cs:
   password_confirmation: "Potvrzení hesla"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "přidat kontakt ze štítku"
     aspect_list: 
       edit_membership: "upravit člena aspektu"
     few: "%{count} lidi"
@@ -329,6 +331,7 @@ cs:
       edit_my_profile: "Upravit můj profil"
       gender: "pohlaví"
       in_aspects: "v aspektech"
+      location: "poloha"
       remove_contact: "odstranit kontakt"
       remove_from: "Odstranit %{name} z %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ cs:
       your_bio: "Váš životopis"
       your_birthday: "Vaše narozeniny"
       your_gender: "Vaše pohlaví"
+      your_location: "Vaše poloha"
       your_name: "Vaše jméno"
       your_photo: "Vaše fotografie"
       your_private_profile: "Váš soukromý profil"
@@ -507,8 +511,8 @@ cs:
       add_photos: "přidat fotky"
       all: "všechny"
       all_contacts: "všechny kontakty"
+      click_to_share_with: "Klikněte pro sdílení s:"
       make_public: "vytvořit veřejnou"
-      mention_helper_text: "pokud chcete někoho zmínit, stiskněte tlačítko '@' a začněte psát jeho jméno"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
       public: "Veřejné"
@@ -569,6 +573,7 @@ cs:
     getting_started: 
       connect_on_diaspora: "Připojit na Diaspoře"
       connect_services: "Připojit vaše další služby"
+      could_not_find_anyone: "Nelze najít žádné přátele na Diaspoře*. Použijte hledání přátel k jejich pozvání."
       edit_profile: "Upravit váš profil"
       finished: "Dokončeno!"
       save_and_continue: "Uložit a pokračovat"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 57d674e44132f8338264cfd2fe1f567c83b9faef..cdde03d4ae0bb9a92b049431d9e0b41c0126664f 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -33,6 +33,7 @@ cy:
             username: 
               taken: "is already taken."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ cy:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ cy:
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ cy:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ cy:
       add_photos: "add photos"
       all: "all"
       all_contacts: "all contacts"
+      click_to_share_with: "Click to share with: "
       make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ cy:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 52c8c58c3de5370bf0cf9d037f1b8c97681c5911..2d7d6e241bb4a3be48681d1f3c1afe9a9efb4f3b 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -33,6 +33,7 @@ da:
             username: 
               taken: "er allerede taget."
   ago: "%{time} siden"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -74,7 +75,7 @@ da:
       remove_aspect: "Slet dette aspekt"
       rename: "omdøb"
       update: "Opdater"
-      updating: "updating"
+      updating: "opdaterer"
     few: "%{count} aspekter"
     helper: 
       are_you_sure: "Er du sikker på at du vil fjerne dette aspekt?"
@@ -227,17 +228,17 @@ da:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        zero: "no people disliked this"
+        few: "%{count} personer kunne ikke lide det"
+        many: "%{count} personer kunne ikke lide det"
+        one: "1 person kunne ikke lide det"
+        other: "%{count} personer kunne ikke lide det"
+        zero: "ingen personer kunne ikke lide det"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
+        few: "%{count} personer kunne lide det"
+        many: "%{count} personer kunne lide det"
+        one: "1 person kunne lide det"
+        other: "%{count} personer kunne lide det"
+        zero: "ingen personer kunne lide det"
   more: "Mere"
   next: "Næste"
   notifications: 
@@ -260,6 +261,7 @@ da:
     mentioned: "har omtalt dig i deres"
     new_request: "tilbød at dele med dig."
     post: "indlæg"
+    private_message: "sent you a message."
     request_accepted: "accepterede din anmodning."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ da:
     diaspora: "Diaspora e-mail robotten"
     hello: "Hej %{name}!"
     love: "Hilsen,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "rediger dine email indstillinger"
     mentioned: 
       mentioned: "omtalte dig i en post:"
       sign_in: "Log in for at se det."
@@ -302,7 +304,7 @@ da:
   password_confirmation: "Adgangskode bekræftelse"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "tilføj kontakt fra tag"
     aspect_list: 
       edit_membership: "redigér aspektsmedlemsskab"
     few: "%{count} personer"
@@ -329,6 +331,7 @@ da:
       edit_my_profile: "Redigér min profil"
       gender: "køn"
       in_aspects: "i aspekter"
+      location: "location"
       remove_contact: "fjern kontaktperson"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ da:
       your_bio: "Din bio"
       your_birthday: "Din fødselsdag"
       your_gender: "Dit køn"
+      your_location: "Your location"
       your_name: "Dit navn"
       your_photo: "Dit foto"
       your_private_profile: "Din private profil"
@@ -507,11 +511,11 @@ da:
       add_photos: "Tilføj billeder"
       all: "alle"
       all_contacts: "alle kontaktpersoner"
+      click_to_share_with: "Click to share with: "
       make_public: "offentliggør"
-      mention_helper_text: "for at nævne nogen i en post, tryk '@' og begynd at skrive deres navn"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
-      public: "Public"
+      public: "Offentlig"
       publishing_to: "del med: "
       share: "Del"
       share_with: "Del med"
@@ -519,8 +523,8 @@ da:
     reshare: 
       reshare: "Del igen"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Jeg kan ikke lide det"
+      like: "Jeg kan lide det"
   status_messages: 
     create: 
       success: "%{names} nævnet med succes"
@@ -532,7 +536,7 @@ da:
       mentioning: "Nævnt: %{person}"
     show: 
       destroy: "Slet"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Desværre, vi kunne ikke finde den post."
       permalink: "permanentlink"
   stream_helper: 
     hide_comments: "Skjul kommentarer"
@@ -569,6 +573,7 @@ da:
     getting_started: 
       connect_on_diaspora: "Forbind på Diaspora"
       connect_services: "Tilslut dine eksisterende tjenester"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Redigér din profil"
       finished: "Færdig!"
       save_and_continue: "Gem og fortsæt"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 08e8a81f64bea56555252e54cbd4bbe577b4a4f3..dac32662ca8f0316314d8cc6d272f0ca346e0aed 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -33,6 +33,7 @@ de:
             username: 
               taken: "wird schon benutzt."
   ago: "Vor %{time}"
+  all_aspects: "Alle Aspekte"
   application: 
     helper: 
       aspect_badge: 
@@ -74,7 +75,7 @@ de:
       remove_aspect: "Aspekt löschen"
       rename: "umbenennen"
       update: "Aktualisieren"
-      updating: "updating"
+      updating: "Aktualisiere"
     few: "%{count} Aspekte"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
@@ -260,6 +261,7 @@ de:
     mentioned: "hat dich erwähnt in "
     new_request: "hat angeboten mit dir zu teilen."
     post: "Beitrag"
+    private_message: "hat dir eine Nachricht gesendet."
     request_accepted: "hat deine Teilen-Anfrage angenommen."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ de:
     diaspora: "der Diaspora E-Mail-Roboter"
     hello: "Hallo %{name}!"
     love: "Gruß,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "E-Mail  Einstellungen"
     mentioned: 
       mentioned: "hat dich in einem Beitrag erwähnt:"
       sign_in: "Melde dich an um sie zu sehen."
@@ -302,7 +304,7 @@ de:
   password_confirmation: "Passwort-Bestätigung"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "Fügr Kontakt über Tag hinzu"
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
     few: "%{count} Personen"
@@ -321,7 +323,7 @@ de:
       add_contact: "Kontakt hinzufügen"
       already_connected: "Bereits verbunden"
       pending_request: "Ausstehende Anfrage"
-      thats_you: "Das bist Du!"
+      thats_you: "Das bist du!"
     profile_sidebar: 
       bio: "Beschreibung"
       born: "Geburtstag"
@@ -329,6 +331,7 @@ de:
       edit_my_profile: "Mein Profil bearbeiten"
       gender: "Geschlecht"
       in_aspects: "in Aspekten"
+      location: "Ort"
       remove_contact: "Kontakt entfernen"
       remove_from: "%{name} aus %{aspect} entfernen?"
     show: 
@@ -399,12 +402,13 @@ de:
       your_bio: "Deine Biographie"
       your_birthday: "Dein Geburtstag"
       your_gender: "Dein Geschlecht"
+      your_location: "Dein Ort"
       your_name: "Dein Name"
       your_photo: "Dein Profilbild"
       your_private_profile: "Dein privates Profil"
       your_public_profile: "Dein öffentliches Profil"
       your_tags: "Du in fünf #Tags"
-      your_tags_placeholder: "Zum Beispiel: #Diaspora #bügeln #Kätzchen #Musik"
+      your_tags_placeholder: "Zum Beispiel: #Diaspora #lustig #Kätzchen #Musik"
     update: 
       failed: "Fehler beim aktualisieren deines Profils"
       updated: "Profil aktualisiert"
@@ -489,7 +493,7 @@ de:
       cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. (Wenn du nicht länger verbunden sein willst, lösche den Kontakt.)"
     invitations: 
       by_email: "per E-Mail"
-      dont_have_now: "Du hast im Moment keine, aber es wird bald wieder neue Einladungen geben!"
+      dont_have_now: "Du hast im Moment keine Einladungen zur Verfügung, aber es wird bald wieder neue geben!"
       from_facebook: "Von Facebook"
       invitations_left: "(%{count} übrig)"
       invite_someone: "Jemanden einladen"
@@ -507,11 +511,11 @@ de:
       add_photos: "Fotos hinzufügen"
       all: "alle"
       all_contacts: "Alle Kontakte"
+      click_to_share_with: "Klicke, um mit diesen zu teilen: "
       make_public: "öffentlich machen"
-      mention_helper_text: "um jemanden zu erwähnen, drücke '@' und beginne den Namen zu schreiben"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
-      public: "Public"
+      public: "Öffentlich"
       publishing_to: "Veröffentlichen an: "
       share: "Teilen"
       share_with: "Teile mit"
@@ -532,7 +536,7 @@ de:
       mentioning: "Erwähnt: %{person}"
     show: 
       destroy: "Entfernen"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Es tut und Leid aber wir konnten den Post nicht finden."
       permalink: "Permalink"
   stream_helper: 
     hide_comments: "Kommentare verbergen"
@@ -569,6 +573,7 @@ de:
     getting_started: 
       connect_on_diaspora: "Mit Diaspora* verbinden"
       connect_services: "Mit deinen anderen Diensten verbinden"
+      could_not_find_anyone: "Es konnten keine Freunde auf Diaspora* gefunden werden. Benutze den Freundefinder, um diese einzuladen."
       edit_profile: "Bearbeite dein Profil"
       finished: "Fertig!"
       save_and_continue: "Speichern und weiter"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 8f3dac2db6e56bfc31e4915b88fb81ed014184d9..4265150e38d0fe88de609f1a0a2d449f5eee30bc 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -33,6 +33,7 @@ el:
             username: 
               taken: "είναι ήδη σε χρήση."
   ago: "%{time} πριν"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ el:
     mentioned: "σας ανέφερε στο"
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
     post: "δημοσίευση"
+    private_message: "sent you a message."
     request_accepted: "δέχτηκε το αίτημα σας για διαμοιρασμό. "
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ el:
       edit_my_profile: "Επεξεργασία του προφίλ μου"
       gender: "φύλο"
       in_aspects: "στις πτυχές"
+      location: "location"
       remove_contact: "αφαίρεση επαφής"
       remove_from: "Αφαίρεση του χρήστη %{name} από τη πτυχή %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ el:
       your_bio: "To βιογραφικό σας"
       your_birthday: "Τα γενέθλιά σας"
       your_gender: "Tο φύλο σας"
+      your_location: "Your location"
       your_name: "Το όνομά σας"
       your_photo: "Η φωτογραφία σας"
       your_private_profile: "Το ιδιωτικό σας προφίλ"
@@ -507,8 +511,8 @@ el:
       add_photos: "προσθέστε φωτογραφίες"
       all: "όλα"
       all_contacts: "όλες οι επαφές"
+      click_to_share_with: "Click to share with: "
       make_public: "Δημοσιοποίησε το"
-      mention_helper_text: "για ν' αναφέρεις κάποιον, πάτα '@' και άρχισε να πληκτρολογείς το όνομα του"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
       public: "Public"
@@ -569,6 +573,7 @@ el:
     getting_started: 
       connect_on_diaspora: "Σύνδεση στο Diaspora"
       connect_services: "Συνδεθείτε με άλλες υπηρεσίες"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Επεξεργασία του προφίλ σας"
       finished: "Τέλος!"
       save_and_continue: "Αποθήκευση και συνέχεια"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 5fea4ca464def10599a9aab0c620cd6c9bb81250..b0fa7f93a484f0c71ef5e067dd9efe90e744e008 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -33,6 +33,7 @@ en_shaw:
             username: 
               taken: "𐑦𐑟 𐑷𐑤𐑮𐑧𐑛𐑦 𐑑𐑱𐑒𐑩𐑯."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ en_shaw:
     mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑞𐑺"
     new_request: "𐑪𐑓𐑼𐑛 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿."
     post: "𐑐𐑴𐑕𐑑"
+    private_message: "sent you a message."
     request_accepted: "𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ en_shaw:
       edit_my_profile: "𐑧𐑛𐑦𐑑 𐑥𐑲 𐑐𐑮𐑴𐑓𐑲𐑤"
       gender: "𐑡𐑧𐑯𐑛𐑼"
       in_aspects: "𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+      location: "location"
       remove_contact: "𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       remove_from: "𐑮𐑦𐑥𐑵𐑝 %{name} 𐑓𐑮𐑪𐑥 %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ en_shaw:
       your_bio: "𐑿𐑼 𐑚𐑲𐑴"
       your_birthday: "𐑿𐑼 𐑚𐑻𐑔𐑛𐑱"
       your_gender: "𐑿𐑼 𐑡𐑧𐑯𐑛𐑼"
+      your_location: "Your location"
       your_name: "𐑿𐑼 𐑯𐑱𐑥"
       your_photo: "𐑿𐑼 𐑓𐑴𐑑𐑴"
       your_private_profile: "𐑿𐑼 𐑐𐑮𐑲𐑝𐑩𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
@@ -507,8 +511,8 @@ en_shaw:
       add_photos: "𐑨𐑛 𐑓𐑴𐑑𐑴𐑟"
       all: "𐑷𐑤"
       all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+      click_to_share_with: "Click to share with: "
       make_public: "𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒"
-      mention_helper_text: "𐑑 𐑥𐑧𐑯𐑖𐑩𐑯 𐑕𐑳𐑥𐑢𐑩𐑯, 𐑐𐑮𐑧𐑕 '@' 𐑯 𐑕𐑑𐑸𐑑 𐑑𐑲𐑐𐑦𐑙 𐑞𐑺 𐑯𐑱𐑥"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
       public: "Public"
@@ -569,6 +573,7 @@ en_shaw:
     getting_started: 
       connect_on_diaspora: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
       connect_services: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑿𐑼 𐑳𐑞𐑼 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "𐑧𐑛𐑦𐑑 𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤"
       finished: "𐑓𐑦𐑯𐑦𐑖𐑑!"
       save_and_continue: "𐑕𐑱𐑝 𐑯 𐑒𐑩𐑯𐑑𐑦𐑯𐑿"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 2b799f52b6ad7db5901ff150b6d33178c487bb52..7c4b441787af646658cb3f8a7fe84a5e0b03bc9e 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -33,6 +33,7 @@ eo:
             username: 
               taken: "is already taken."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ eo:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ eo:
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ eo:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ eo:
       add_photos: "add photos"
       all: "all"
       all_contacts: "all contacts"
+      click_to_share_with: "Click to share with: "
       make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ eo:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your other services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index e49b45ea8451cef4bf2bd67185ae339f06eef3e6..2ef849e542c0436ef4111480b1f7a9f8df91c9d7 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -33,6 +33,7 @@ es-CL:
             username: 
               taken: "Ya está siendo ocupado."
   ago: "hace %{time}"
+  all_aspects: "Todos los Aspectos"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ es-CL:
     mentioned: "te mencionó en su"
     new_request: "quiere compartir contigo."
     post: "post"
+    private_message: "te envió un mensaje."
     request_accepted: "aceptó tu solicitud de contacto."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ es-CL:
     diaspora: "correo robot de diaspora"
     hello: "¡Hola %{name}!"
     love: "cariño,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "maneja tus configuraciones de email"
     mentioned: 
       mentioned: "Te mencionó en un post:"
       sign_in: "Conéctate para verlo."
@@ -302,7 +304,7 @@ es-CL:
   password_confirmation: "Confirmar contraseña"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "agrega un contacto desde una etiqueta"
     aspect_list: 
       edit_membership: "Editar el Aspecto donde está el contacto"
     few: "%{count} personas"
@@ -329,6 +331,7 @@ es-CL:
       edit_my_profile: "Editar mi perfil"
       gender: "sexo"
       in_aspects: "en aspectos"
+      location: "Ubicación"
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ es-CL:
       your_bio: "Tu biografía"
       your_birthday: "Tu cumpleaños"
       your_gender: "Tu genero"
+      your_location: "Tú ubicación"
       your_name: "Tu nombre"
       your_photo: "Tu foto"
       your_private_profile: "Tú perfil privado"
@@ -507,11 +511,11 @@ es-CL:
       add_photos: "agregar fotos"
       all: "todo"
       all_contacts: "todos los contactos"
+      click_to_share_with: "Click para compartir con: "
       make_public: "hacer público"
-      mention_helper_text: "para mencionar a alguien, usa '@' antes de su nombre"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
-      public: "Public"
+      public: "Público"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con "
@@ -532,7 +536,7 @@ es-CL:
       mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Perdón, no pudimos encontrar ese post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ocultar comentarios"
@@ -569,6 +573,7 @@ es-CL:
     getting_started: 
       connect_on_diaspora: "Conectar en Diaspora"
       connect_services: "Conectar tus otros servicios"
+      could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Usa el buscador de amigos para invitarlos."
       edit_profile: "Editar tu perfil"
       finished: "¡Terminaste!"
       save_and_continue: "Guardar y continuar"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index ec8289cb7b0234bed78741f67d5c29ad1804ab09..a0baa9e49d79141bc7ddb80f9db82d3668c3f518 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -33,6 +33,7 @@ es:
             username: 
               taken: "ya está ocupado."
   ago: "hace %{time} "
+  all_aspects: "Todos los Aspectos"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ es:
     mentioned: "te nombró en su"
     new_request: "quisiera compartir contigo."
     post: "publicación"
+    private_message: "te envió un mensaje."
     request_accepted: "aceptó tu solicitud de contacto."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ es:
     diaspora: "Email robot de Diaspora*"
     hello: "¡Hola %{name}!"
     love: "¡Qué pasa!"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "Gestiona tus configuraciones de correo"
     mentioned: 
       mentioned: "te nombró en una publicación:"
       sign_in: "Conéctate para verlo."
@@ -302,7 +304,7 @@ es:
   password_confirmation: "Confirmación de contraseña"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "añadir contacto desde una etiqueta"
     aspect_list: 
       edit_membership: "editar el Aspecto donde está el contacto"
     few: "%{count} personas"
@@ -329,6 +331,7 @@ es:
       edit_my_profile: "Editar mi Perfil"
       gender: "genero / sexo"
       in_aspects: "en Aspectos"
+      location: "Ubicación "
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ es:
       your_bio: "Tu Biografía"
       your_birthday: "Tu Cumpleaños"
       your_gender: "Tu Género / Sexo"
+      your_location: "Tú ubicación"
       your_name: "Tu Nombre"
       your_photo: "Tu Foto"
       your_private_profile: "Tu perfil privado"
@@ -507,11 +511,11 @@ es:
       add_photos: "Añadir fotos"
       all: "todo"
       all_contacts: "Todos los contactos"
+      click_to_share_with: "Haz click para compartir con: "
       make_public: "Publicar"
-      mention_helper_text: "para nombrar a alguien, usa \"@\" justo antes"
       post_a_message_to: "Enviar un mensaje a %{aspect}"
       posting: "Publicando..."
-      public: "Public"
+      public: "Publico"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "compartir con"
@@ -532,7 +536,7 @@ es:
       mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Lo sentimos, no pudimos encontrar esa publicación."
       permalink: "Enlace permanente"
   stream_helper: 
     hide_comments: "Ocultar comentarios"
@@ -569,6 +573,7 @@ es:
     getting_started: 
       connect_on_diaspora: "Conectar en Diaspora*"
       connect_services: "Conectar con otros Servicios"
+      could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Use el buscador de amigos para invitarlos."
       edit_profile: "Editar tu Perfil"
       finished: "¡Finalizado!"
       save_and_continue: "Guardar y continuar"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 17b86aa906d0197b86554374290ae8f993d98122..a994b9b254871b91e013fc8661d20f6419281ba8 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -33,6 +33,7 @@ eu:
             username: 
               taken: "erabilpenean dago jada."
   ago: "%{time} d(ir)ela"
+  all_aspects: "Alderdi guztiak"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ eu:
     mentioned: "aipatu zaituzte bere"
     new_request: "(e)k zurekin partekatu nahi du."
     post: "mezua"
+    private_message: "(e)k mezu bat bidali dizu."
     request_accepted: "zure partekatze eskaera onartu du."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ eu:
     diaspora: "diasporaren e-posta robota"
     hello: "Kaixo, %{name}!"
     love: "ikusi arte,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "kudeatu zure e-posta ezarpenak"
     mentioned: 
       mentioned: "zu aipatu zaituzte mezu batean:"
       sign_in: "Sartu ikusteko."
@@ -302,7 +304,7 @@ eu:
   password_confirmation: "Pasahitz baieztapena"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "gehitu adiskidea etiketatik abiatuta"
     aspect_list: 
       edit_membership: "aldatu alderdiaren bazkidetza"
     few: "%{count} pertsona"
@@ -329,6 +331,7 @@ eu:
       edit_my_profile: "Nire profila aldatu"
       gender: "sexua"
       in_aspects: "alderdietan"
+      location: "kokalekua"
       remove_contact: "adiskidea ezabatu"
       remove_from: "%{name} ezabatu %{aspect} alderditik?"
     show: 
@@ -399,6 +402,7 @@ eu:
       your_bio: "Zuri buruz"
       your_birthday: "Zure urtemuga"
       your_gender: "Zure sexua"
+      your_location: "Zure kokalekua"
       your_name: "Zure izena"
       your_photo: "Zure argazkia"
       your_private_profile: "Zure profil pribatua"
@@ -507,8 +511,8 @@ eu:
       add_photos: "argazkiak gehitu"
       all: "guztiak"
       all_contacts: "adiskide guztiak"
+      click_to_share_with: "Sakatu hauekin partekatzeko:"
       make_public: "publikoa egin"
-      mention_helper_text: "norbait aipatzeko, sakatu '@' eta hasi adiskidearen izena idazten"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
       public: "Publikoa"
@@ -569,6 +573,7 @@ eu:
     getting_started: 
       connect_on_diaspora: "Konektatu Diasporan"
       connect_services: "Beste zerbitzu batzuekin lotu"
+      could_not_find_anyone: "Ezin izan da adiskiderik aurkitu Diasporan. Erabili adiskide bilatzailea norbait gonbidatzeko."
       edit_profile: "Zure profila aldatu"
       finished: "Bukatua!"
       save_and_continue: "Gorde eta jarraitu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 93c93adcb97e35d89ced086c4d06167ab65941a7..594d1b8560b1d872d4d7a384e99068d828d477a6 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -33,6 +33,7 @@ fi:
             username: 
               taken: "on jo varattu."
   ago: "%{time} sitten"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ fi:
     mentioned: "on maininnut sinut heidän"
     new_request: "haluaa jakaa kanssasi."
     post: "viesti"
+    private_message: "sent you a message."
     request_accepted: "hyväksyi jakopyyntösi."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ fi:
       edit_my_profile: "Muokkaa profiilia"
       gender: "Sukupuoli"
       in_aspects: "näkymissä"
+      location: "location"
       remove_contact: "poista kontakti"
       remove_from: "Poista %{name} näkymästä %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ fi:
       your_bio: "Biografia"
       your_birthday: "Syntymäpäivä"
       your_gender: "Sukupuolesi"
+      your_location: "Your location"
       your_name: "Nimesi"
       your_photo: "Profiili kuva"
       your_private_profile: "Yksityinen profiilisi"
@@ -507,8 +511,8 @@ fi:
       add_photos: "lisää kuvia"
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
+      click_to_share_with: "Click to share with: "
       make_public: "tee julkiseksi"
-      mention_helper_text: "mainitaksesi jonkun, valitse '@' ja kirjoita nimen alku"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       public: "Public"
@@ -569,6 +573,7 @@ fi:
     getting_started: 
       connect_on_diaspora: "Yhdistä Diasporaan"
       connect_services: "Yhdistä muut palvelusi"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Muokkaa profiiliasi"
       finished: "Valmis!"
       save_and_continue: "Tallenna ja jatka"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 897151ab3da4cd5d7218af5c436db1f9af757d16..83dcd8581a143bd9a6ccf945f37b61961bfc678a 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -33,6 +33,7 @@ fr:
             username: 
               taken: "est déjà pris."
   ago: "Il y a %{time}"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ fr:
     mentioned: "vous a mentionné(e) dans son"
     new_request: "a proposé de partager avec vous."
     post: "message"
+    private_message: "sent you a message."
     request_accepted: "a accepté votre demande de partage."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ fr:
       edit_my_profile: "Modifier mon profil"
       gender: "sexe"
       in_aspects: "dans les aspects"
+      location: "location"
       remove_contact: "supprimer le contact"
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
@@ -399,6 +402,7 @@ fr:
       your_bio: "Votre biographie"
       your_birthday: "Votre anniversaire"
       your_gender: "Votre sexe"
+      your_location: "Your location"
       your_name: "Votre nom"
       your_photo: "Votre photo"
       your_private_profile: "Votre profil privé"
@@ -507,8 +511,8 @@ fr:
       add_photos: "ajouter des photos"
       all: "tous"
       all_contacts: "tous les contacts"
+      click_to_share_with: "Click to share with: "
       make_public: "rendre public"
-      mention_helper_text: "pour mentionner quelqu'un, insérez un « @ » et commencez à écrire son nom"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
       public: "Public"
@@ -569,6 +573,7 @@ fr:
     getting_started: 
       connect_on_diaspora: "Se connecter sur Diaspora"
       connect_services: "Connectez vos autres services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Modifiez votre profil"
       finished: "Terminé !"
       save_and_continue: "Enregistrer et continuer"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 9b8b2d39fb2004a891a412974e40637609544a6d..6f0c94357753f89264b339c4f06767c950d1d823 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -33,6 +33,7 @@ ga:
             username: 
               taken: "is already taken."
   ago: "%{time} ó shin"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ ga:
     mentioned: "has mentioned you in their"
     new_request: "ofráiladh chun roint leant"
     post: "póst"
+    private_message: "sent you a message."
     request_accepted: "glacadh le do iarratas roinnt"
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ ga:
       edit_my_profile: "Athraigh mo próifíl"
       gender: "inscne"
       in_aspects: "i gnéithe"
+      location: "location"
       remove_contact: "fhaíl ré le teagmháil"
       remove_from: "Fháil ré le %{name} ó %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ ga:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ ga:
       add_photos: "cuir pictiúrí le"
       all: "gach rud"
       all_contacts: "gach teagmháil"
+      click_to_share_with: "Click to share with: "
       make_public: "dean phoiblí"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
       public: "Public"
@@ -569,6 +573,7 @@ ga:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Ceangailt do seirbhísí eile"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Athraigh do próifíl"
       finished: "Críochnaithe!"
       save_and_continue: "Sáibháil agus leanúint ar aghaidh"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 138dda9fa3ff4f62eb2936b191f3b427f87b2641..274666856fade1ff906561759e8f51d07ab38c0d 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -33,6 +33,7 @@ gl:
             username: 
               taken: "xa está collido."
   ago: "hai %{time}"
+  all_aspects: "Todos os aspectos"
   application: 
     helper: 
       aspect_badge: 
@@ -243,7 +244,7 @@ gl:
   notifications: 
     also_commented: "tamén comentou nos de %{post_author}"
     also_commented_deleted: "comentou nunha publicación eliminada"
-    comment_on_post: "comentou no teu"
+    comment_on_post: "comentou na túa"
     deleted: "borrado"
     helper: 
       new_notifications: 
@@ -260,6 +261,7 @@ gl:
     mentioned: "citoute nos seus"
     new_request: "ofreceu compartir contigo."
     post: "publicación"
+    private_message: "enviouche unha mensaxe."
     request_accepted: "aceptou a túa petición para compartir."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ gl:
     diaspora: "robot do correo electrónico de Diaspora"
     hello: "Ola %{name}!"
     love: "bicos,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "opcións de email"
     mentioned: 
       mentioned: "citoute nunha publicación:"
       sign_in: "Entra para velo."
@@ -302,7 +304,7 @@ gl:
   password_confirmation: "Confirmación do contrasinal"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "engadir contacto dende etiqueta"
     aspect_list: 
       edit_membership: "Editar membresía de aspecto"
     few: "%{count} persoas"
@@ -329,6 +331,7 @@ gl:
       edit_my_profile: "Editar o meu perfil"
       gender: "Xénero"
       in_aspects: "en aspectos"
+      location: "localización"
       remove_contact: "borrar contacto"
       remove_from: "Eliminar %{name} de %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ gl:
       your_bio: "Biografía"
       your_birthday: "O teu aniversario"
       your_gender: "O teu xénero"
+      your_location: "A túa localización"
       your_name: "O teu nome"
       your_photo: "A túa foto"
       your_private_profile: "O teu perfil privado"
@@ -507,11 +511,11 @@ gl:
       add_photos: "engadir fotos"
       all: "todos"
       all_contacts: "todos os contactos"
+      click_to_share_with: "Click para compartir con:"
       make_public: "facer público"
-      mention_helper_text: "Para citar a alguén, pon \"@\" e teclea o seu nome"
       post_a_message_to: "Deixar un mensaxe en %{aspect}"
       posting: "Publicando..."
-      public: "Public"
+      public: "Público"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con %{aspect}"
@@ -532,7 +536,7 @@ gl:
       mentioning: "Mencionando: %{person}"
     show: 
       destroy: "Borrar"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Sentímolo, non poidemos encontrar esa publicación."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "esconder comentarios"
@@ -569,6 +573,7 @@ gl:
     getting_started: 
       connect_on_diaspora: "Conectar a Diaspora"
       connect_services: "Conectar a outros servizos"
+      could_not_find_anyone: "Non se atoparon amigos en Diaspora*. Usa o buscador para invitalos."
       edit_profile: "Edita o teu perfil"
       finished: "Xa está!"
       save_and_continue: "Gardar e continuar"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 7b31c093bd09c7be843b7954f3147073ef43af47..e0c7abee41930a7058b62adb8605b3ba9a7a053e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -33,6 +33,7 @@ he:
             username: 
               taken: "כבר תפוס."
   ago: "%{time} עברו"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ he:
     mentioned: "הזכיר/ה אותך ב־"
     new_request: "הציע/ה לשתף אתך."
     post: "רשומה"
+    private_message: "sent you a message."
     request_accepted: "קיבל/ה את בקשת השיתוף שלך."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ he:
       edit_my_profile: "עריכת הפרופיל שלי"
       gender: "מגדר"
       in_aspects: "בהיבטים"
+      location: "location"
       remove_contact: "הסרת איש קשר"
       remove_from: "האם להסיר את %{name} מההיבט %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ he:
       your_bio: "הביוגרפיה שלך"
       your_birthday: "יום ההולדת שלך"
       your_gender: "המגדר שלך"
+      your_location: "Your location"
       your_name: "שמך"
       your_photo: "התמונה שלך"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ he:
       add_photos: "הוספת תמונות"
       all: "הכול"
       all_contacts: "כל אנשי הקשר"
+      click_to_share_with: "Click to share with: "
       make_public: "הפיכה לציבורי"
-      mention_helper_text: "כדי להזכיר שם של מישהו, יש ללחוץ על '@' ולהתחיל לכתוב את שמו"
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
       public: "Public"
@@ -569,6 +573,7 @@ he:
     getting_started: 
       connect_on_diaspora: "יצירת קשר דרך Diaspora"
       connect_services: "התחברות לשירותים הנוספים שלך"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "עריכת הפרופיל שלך"
       finished: "סיימת!"
       save_and_continue: "שמירה והמשך"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index b282745488b6729fb27574ec84604e0086e64beb..16d2e1a83aa3db86c8a9bec5196283387036934c 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -33,6 +33,7 @@ hu:
             username: 
               taken: "már foglalt."
   ago: "ezelőtt"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ hu:
     mentioned: "megemlítettek téged a"
     new_request: "megosztást ajánlott neked."
     post: "bejegyzés"
+    private_message: "sent you a message."
     request_accepted: "elfogadta a megosztási kérésed."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ hu:
       edit_my_profile: "Profilom szerkesztése"
       gender: "nem"
       in_aspects: "csoportokban"
+      location: "location"
       remove_contact: "kapcsolat törlése"
       remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
     show: 
@@ -399,6 +402,7 @@ hu:
       your_bio: "Rólam"
       your_birthday: "Szülinapom"
       your_gender: "Nem"
+      your_location: "Your location"
       your_name: "Nevem"
       your_photo: "Fényképem"
       your_private_profile: "Személyes profilod"
@@ -507,8 +511,8 @@ hu:
       add_photos: "Képek hozzáadása"
       all: "összes"
       all_contacts: "összes kapcsolat"
+      click_to_share_with: "Click to share with: "
       make_public: "nyilvánossá tesz"
-      mention_helper_text: "valaki megemlítéséhez írj '@' jelet, és kezd el írni a nevet"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
       public: "Public"
@@ -569,6 +573,7 @@ hu:
     getting_started: 
       connect_on_diaspora: "Kapcsolat a Diaspora-n"
       connect_services: "Csatold a többi szolgáltatásod is ide"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Profil szerkesztése"
       finished: "Kész!"
       save_and_continue: "Mentés és folytatás"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index d886a0964899b8d86a219561c4bcfb58af592d54..93ad378dcee4a971f17197630d06ba0d8d79d894 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -33,6 +33,7 @@ id:
             username: 
               taken: "is already taken."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ id:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ id:
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ id:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ id:
       add_photos: "add photos"
       all: "all"
       all_contacts: "all contacts"
+      click_to_share_with: "Click to share with: "
       make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ id:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index e2054436a242ff9d16a32e7934cc6989b0d598db..a675753c1f8ba095db1f7fb0b20081c731c408ec 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -33,6 +33,7 @@ is:
             username: 
               taken: "er þegar í notkun."
   ago: "%{time} síðan"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ is:
     mentioned: "hefur getið þín í þeirra"
     new_request: "bauð þér samnýtingu."
     post: "setja inn"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ is:
       edit_my_profile: "Breyta síðunni minni"
       gender: "kyn"
       in_aspects: "í ásýnd"
+      location: "location"
       remove_contact: "fjarlægja tengilið"
       remove_from: "Fjarlægja %{name} úr %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ is:
       your_bio: "Ferilskrá þín"
       your_birthday: "Fæðingardagur þinn"
       your_gender: "Kyn þitt"
+      your_location: "Your location"
       your_name: "Nafn þitt"
       your_photo: "Mynd þín"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ is:
       add_photos: "bæta myndum við"
       all: "allt"
       all_contacts: "Allir tengiliðir"
+      click_to_share_with: "Click to share with: "
       make_public: "gera almennt"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: "Senda..."
       public: "Public"
@@ -569,6 +573,7 @@ is:
     getting_started: 
       connect_on_diaspora: "Tengjast á Diaspora"
       connect_services: "Tengjast öðrum þjónustum þínum"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Breyta síðunni þinni"
       finished: "Búið!"
       save_and_continue: "Vista og halda áfram"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index e3e9d522bfdc0c8933aa6b5edf7990737da27038..b827924f5ff95e3e075ff6a594d04e227e497193 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -33,6 +33,7 @@ it:
             username: 
               taken: "è già stato preso."
   ago: "%{time} fa"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ it:
     mentioned: "ti ha menzionato nel suo"
     new_request: "vuole condividere con te."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "ha accettato la tua richiesta di condivisione."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ it:
       edit_my_profile: "Modifica il mio profilo"
       gender: "sesso"
       in_aspects: "negli aspetti"
+      location: "location"
       remove_contact: "rimuovi contatto"
       remove_from: "Rimuovere %{name} da %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ it:
       your_bio: "La tua biografia"
       your_birthday: "Il tuo compleanno"
       your_gender: "Sesso"
+      your_location: "Your location"
       your_name: "Il tuo nome"
       your_photo: "La tua foto"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ it:
       add_photos: "aggiungi foto"
       all: "tutti"
       all_contacts: "tutti i contatti"
+      click_to_share_with: "Click to share with: "
       make_public: "pubblica"
-      mention_helper_text: "per menzionare qualcuno, inserisci '@' e digita il suo nome"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       public: "Public"
@@ -569,6 +573,7 @@ it:
     getting_started: 
       connect_on_diaspora: "Connetti su Diaspora"
       connect_services: "Collega i tuoi servizi"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Modifica il tuo profilo"
       finished: "Finito!"
       save_and_continue: "Salva e continua"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index d5171e4c0dcf1a9c7756660acd1fbd0cc95ba479..3f00ab12581b98f70e909ac5b118519a24b80b2f 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -33,6 +33,7 @@ lt:
             username: 
               taken: "is already taken."
   ago: "%{time} prieš"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ lt:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ lt:
       edit_my_profile: "Redaguoti mano profilį"
       gender: "lytis"
       in_aspects: "aspektuose"
+      location: "location"
       remove_contact: "pašalinti kontaktą"
       remove_from: "Ar pašalinti kontaktą \"%{name}\" iš aspekto \"%{aspect}\"?"
     show: 
@@ -399,6 +402,7 @@ lt:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ lt:
       add_photos: "pridėti nuotraukų"
       all: "viskas"
       all_contacts: "visi kontaktai"
+      click_to_share_with: "Click to share with: "
       make_public: "paviešinti"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
       public: "Public"
@@ -569,6 +573,7 @@ lt:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Prijunk savo tinklus"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Užpildyk savo profilį"
       finished: "Baigta!"
       save_and_continue: "Išsaugoti ir tęsti"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index a72b43ff2819c1e71f2ae7d24e686219241a5d2a..39aa30570dcbf0a45b5611431f033d51356c252a 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -33,6 +33,7 @@ mk:
             username: 
               taken: "is already taken."
   ago: "%{time} пред"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ mk:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ mk:
       edit_my_profile: "Уреди го мојот профил"
       gender: "пол"
       in_aspects: "во аспекти"
+      location: "location"
       remove_contact: "одстрани контакт"
       remove_from: "Одстрани %{name} од %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ mk:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ mk:
       add_photos: "додај слики"
       all: "сите"
       all_contacts: "сите контакти"
+      click_to_share_with: "Click to share with: "
       make_public: "направи јавен"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
       public: "Public"
@@ -569,6 +573,7 @@ mk:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Поврзи се со другите ваши сервиси"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Уреди го вашиот профил"
       finished: "Заврши!"
       save_and_continue: "Зачувај и продолжи"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 9a66c8b9212a19cbab2408ffbd90c18e1c1974c6..161679bff918e170aeddc58a398883c95999a6d4 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -33,6 +33,7 @@ ml:
             username: 
               taken: "നേരത്തേ എടുത്തിട്ടുണ്ട്."
   ago: "%{time} മുന്‍പ്"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ ml:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "കുറിപ്പ്"
+    private_message: "sent you a message."
     request_accepted: "താങ്കളുടെ പങ്കിടല്‍ അഭ്യര്‍ത്ഥന അംഗീകരിച്ചു."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ ml:
       edit_my_profile: "എന്റെ പ്രൊഫൈല്‍ തിരുത്തുക"
       gender: "ലിംഗം"
       in_aspects: "പരിചയത്തില്‍"
+      location: "location"
       remove_contact: "സമ്പര്‍ക്കം മാറ്റുക"
       remove_from: "%{name} നെ %{aspect} നിന്ന് മാറ്റട്ടേ?"
     show: 
@@ -399,6 +402,7 @@ ml:
       your_bio: "നിങ്ങളുടെ സ്വയം വിവരണം"
       your_birthday: "താങ്കളുടെ ജന്മദിനം"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "താങ്കളുടെ പേര്"
       your_photo: "താങ്കളുടെ ചിത്രം"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ ml:
       add_photos: "ചിത്രങ്ങള്‍ ചേര്‍ക്കുക"
       all: "എല്ലാം"
       all_contacts: "എല്ലാ സമ്പര്‍ക്കവും"
+      click_to_share_with: "Click to share with: "
       make_public: "പൊതുവാക്കുക"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "%{aspect}ല്‍ ഒരു സന്ദേശം പ്രസിദ്ധീകരിക്കുക"
       posting: "കുറിക്കുന്നു..."
       public: "Public"
@@ -569,6 +573,7 @@ ml:
     getting_started: 
       connect_on_diaspora: "ഡയസ്പോറയില്‍ ബന്ധിപ്പിക്കു"
       connect_services: "താങ്കളുടെ മറ്റുള്ള സേവനങ്ങള്‍ ബന്ധിപ്പിക്കു"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "താങ്കളുടെ പ്രൊഫൈല്‍ തിരുത്തുക"
       finished: "തീര്‍ന്നു!"
       save_and_continue: "സൂക്ഷിച്ച ശേഷം തുടരു"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index c2135466dc502e0d0525040a97d81e2a86678dcc..3a4f351a6f1f3452bcf7dfd0064b6cfb0ca301f5 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -33,6 +33,7 @@ nb:
             username: 
               taken: "er allerede tatt."
   ago: "%{time} siden"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ nb:
     mentioned: "har nevnt deg i sin"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ nb:
       edit_my_profile: "Endre profilen min"
       gender: "kjønn"
       in_aspects: "i aspekt"
+      location: "location"
       remove_contact: "fjern kontakt"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ nb:
       your_bio: "Om meg"
       your_birthday: "Din Fødselsdato"
       your_gender: "Ditt kjønn"
+      your_location: "Your location"
       your_name: "Ditt navn"
       your_photo: "Ditt profilbilde"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ nb:
       add_photos: "legg til bilder"
       all: "all"
       all_contacts: "alle kontakter"
+      click_to_share_with: "Click to share with: "
       make_public: "gjør offentlig"
-      mention_helper_text: "for å nevne noen, skriv '@' og begynn å skriv navnet deres"
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
       public: "Public"
@@ -569,6 +573,7 @@ nb:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Rediger profilen"
       finished: "Ferdig!"
       save_and_continue: "Lagre og fortsett"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index ea8cbd9e90eb183a414d93b79cfb223325fd07ba..31d40321951e46074e848aff4a56b618aaf062df 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -33,6 +33,7 @@ nl:
             username: 
               taken: "is al bezet."
   ago: "%{time} geleden"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ nl:
     mentioned: "heeft je genoemd in zijn/haar"
     new_request: "bood aan om met jou te delen."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "heeft je verzoek geaccepteerd."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ nl:
     diaspora: "de diaspora email robot"
     hello: "Hoi %{name}!"
     love: "liefs,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "beheer je e-mail instellingen"
     mentioned: 
       mentioned: "heeft jou genoemd in een post:"
       sign_in: "Log in om het te bekijken."
@@ -302,7 +304,7 @@ nl:
   password_confirmation: "Wachtwoordbevestiging"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "contact toevoegen van tag"
     aspect_list: 
       edit_membership: "bewerk aspect lidmaatschap"
     few: "%{count} personen"
@@ -329,6 +331,7 @@ nl:
       edit_my_profile: "Bewerk mijn profiel"
       gender: "geslacht"
       in_aspects: "in de aspecten"
+      location: "location"
       remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ nl:
       your_bio: "Jouw bio"
       your_birthday: "Je verjaardag"
       your_gender: "Je geslacht"
+      your_location: "Your location"
       your_name: "Je naam"
       your_photo: "Je profielfoto"
       your_private_profile: "Je privé-profiel"
@@ -507,11 +511,11 @@ nl:
       add_photos: "+ foto's"
       all: "al"
       all_contacts: "alle contacten"
+      click_to_share_with: "Click to share with: "
       make_public: "maak openbaar"
-      mention_helper_text: "om iemand te noemen, typ '@' gevolgd door zijn of haar naam"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
-      public: "Public"
+      public: "Openbaar"
       publishing_to: "delen met: "
       share: "Delen"
       share_with: "deel met"
@@ -532,7 +536,7 @@ nl:
       mentioning: "Noem: %{person}"
     show: 
       destroy: "Verwijderen"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Sorry, we konden die post niet vinden."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "verberg reacties"
@@ -569,6 +573,7 @@ nl:
     getting_started: 
       connect_on_diaspora: "Verbind op Diaspora"
       connect_services: "Verbind met je andere services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Bewerk je profiel"
       finished: "Klaar!"
       save_and_continue: "Sla op en ga verder"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index d759d2b1cfb752e7ad0a485cbe05864aeb56079b..a614bea6f05463c104f582374afb59decd3286f4 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -33,6 +33,7 @@ pa:
             username: 
               taken: "is already taken."
   ago: "%{time} ਪਹਿਲਾਂ"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ pa:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "ਪੋਸਟ"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ pa:
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ pa:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ pa:
       add_photos: "add photos"
       all: "ਸਭ"
       all_contacts: "ਸਭ ਸੰਪਰਕਾਂ ਨਾਲ"
+      click_to_share_with: "Click to share with: "
       make_public: "ਪਬਲਿਕ ਬਣਾਓ"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
       public: "Public"
@@ -569,6 +573,7 @@ pa:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your other services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edit your profile"
       finished: "ਪੂਰਾ ਹੋਇਆ!"
       save_and_continue: "Save and continue"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index b378b9f2b8c6ce9c1640cb5b19b3151c51dbe4ff..f502cafdfc0b24bc704346f9d5fca341ca2ab2d5 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -33,6 +33,7 @@ pl:
             username: 
               taken: "is already taken."
   ago: "%{time} temu"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ pl:
     mentioned: "has mentioned you in their"
     new_request: "wysłał Ci zaproszenie do współdzielenia."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "zaakceptował Twoje zaproszenie."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ pl:
       edit_my_profile: "Edycja mojego profilu"
       gender: "płeć"
       in_aspects: "w aspektach"
+      location: "location"
       remove_contact: "usuwanie kontaktu"
       remove_from: "Usunąć %{name} z aspektu %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ pl:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ pl:
       add_photos: "dodaj zdjęcia"
       all: "wszyscy"
       all_contacts: "wszyscy znajomi"
+      click_to_share_with: "Click to share with: "
       make_public: "upublicznij"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Wysyłanie…"
       public: "Public"
@@ -569,6 +573,7 @@ pl:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Połącz się ze swoimi usługami"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edytuj swój profil"
       finished: "Gotowe!"
       save_and_continue: "Zapisz i kontynuuj"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 00229c52f60b819d15822c9bb844c165faaef588..b23ce92872e4a593676d411edff00f0977162dbf 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -33,6 +33,7 @@ pt-BR:
             username: 
               taken: "is already taken."
   ago: "%{time} atrás"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ pt-BR:
     mentioned: "has mentioned you in their"
     new_request: "deseja partilhar com você."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "Aceitou a sua solicitação de partilha."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ pt-BR:
       edit_my_profile: "Editar meu perfil"
       gender: "sexo"
       in_aspects: "nos aspectos"
+      location: "location"
       remove_contact: "remover contato"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ pt-BR:
       your_bio: "Sua biografia"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ pt-BR:
       add_photos: "Adicionar fotos"
       all: "todos"
       all_contacts: "Todos os contatos"
+      click_to_share_with: "Click to share with: "
       make_public: "Tornar público"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Enviar uma mensagem para %{aspect}"
       posting: "Postando..."
       public: "Public"
@@ -569,6 +573,7 @@ pt-BR:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conecte seus outros serviços"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Alterar seu perfil"
       finished: "Pronto!"
       save_and_continue: "Salvar e continuar"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index a4ab850740f5cf03926eea6b4f51bf13c4377f1c..6aefb6f53783c974853b911995881fcf7ab60af5 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -33,6 +33,7 @@ pt-PT:
             username: 
               taken: "já existe."
   ago: "%{time} atrás"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ pt-PT:
     mentioned: "has mentioned you in their"
     new_request: "deseja partilhar consigo."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "Aceitou a sua solicitação de partilha."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ pt-PT:
       edit_my_profile: "Editar o meu perfil"
       gender: "género"
       in_aspects: "nos grupos"
+      location: "location"
       remove_contact: "remover contacto"
       remove_from: "Remover %{name} de %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ pt-PT:
       your_bio: "Sua biografia"
       your_birthday: "O seu aniversário"
       your_gender: "O seu sexo"
+      your_location: "Your location"
       your_name: "O seu prenome"
       your_photo: "A sua foto"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ pt-PT:
       add_photos: "adicionar fotografias"
       all: "tudo"
       all_contacts: "todos os contactos"
+      click_to_share_with: "Click to share with: "
       make_public: "tornar público"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
       public: "Public"
@@ -569,6 +573,7 @@ pt-PT:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Liga os teus outros serviços"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Edita o teu perfil"
       finished: "Terminado!"
       save_and_continue: "Guardar e continuar"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index add9a83f80ee453c5b09e739316324f8dac1ef85..c889635d567267800531c7266e3823e0781e79b6 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -33,6 +33,7 @@ ro:
             username: 
               taken: "is already taken."
   ago: "%{time} ago"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ ro:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ ro:
       edit_my_profile: "Editează profilul meu"
       gender: "gen"
       in_aspects: "în aspecte"
+      location: "location"
       remove_contact: "Elimină contactul"
       remove_from: "Elimini pe %{name} din %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ ro:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ ro:
       add_photos: "adaugă fotografii"
       all: "toate"
       all_contacts: "toate contactele"
+      click_to_share_with: "Click to share with: "
       make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ ro:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Editează-ţi profilul"
       finished: "Finished!"
       save_and_continue: "Salvează si continuă"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 39fc4f38b09fd6697bbb0005925bf3520e3d4e7e..c614f386d1b89a43d1f32df9bc1f82b5063a5fe6 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -33,6 +33,7 @@ ru:
             username: 
               taken: "is already taken."
   ago: "%{time} назад"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ ru:
     mentioned: "has mentioned you in their"
     new_request: "предлагает поделиться с вами."
     post: "сообщение"
+    private_message: "sent you a message."
     request_accepted: "ваш запрос на участие принят."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ ru:
       edit_my_profile: "Редиктировать профиль"
       gender: "пол"
       in_aspects: "в аспектах"
+      location: "location"
       remove_contact: "удалить контакт"
       remove_from: "Удалить %{name} из %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ ru:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ ru:
       add_photos: "добавить фото"
       all: "все"
       all_contacts: "все контакты"
+      click_to_share_with: "Click to share with: "
       make_public: "сделать публичным"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка ..."
       public: "Public"
@@ -569,6 +573,7 @@ ru:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Соедениться с сервисами"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Отредактировать профиль"
       finished: "Готово!"
       save_and_continue: "Сохранить и продолжить"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 8c37c330f0be3294e673b09130e1ca9bec306e50..74039b29917793f976ca3da0f3399bc980557e39 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -33,6 +33,7 @@ sk:
             username: 
               taken: "je už obsadený."
   ago: "%{time} dozadu"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ sk:
     mentioned: "Å¥a spomenuli v ich"
     new_request: "offered to share with you."
     post: "príspevok"
+    private_message: "sent you a message."
     request_accepted: "Vaša požiadavka bola akceptovaná."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ sk:
       edit_my_profile: "Upraviť profil"
       gender: "pohlavie"
       in_aspects: "v aspektoch"
+      location: "location"
       remove_contact: "odstrániť kontakt"
       remove_from: "Odstrániť užívateľa %{name} z aspektu %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ sk:
       your_bio: "Niečo o mne"
       your_birthday: "Dátum narodenia"
       your_gender: "Pohlavie"
+      your_location: "Your location"
       your_name: "Meno"
       your_photo: "Tvoja fotka"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ sk:
       add_photos: "Pridať fotky"
       all: "všetko"
       all_contacts: "VÅ¡etky kontakty"
+      click_to_share_with: "Click to share with: "
       make_public: "Zverejniť"
-      mention_helper_text: "spomenúť niekoho, stlač '@' a začni písať jeho meno"
       post_a_message_to: "Poslať správu na aspekt %{aspect}"
       posting: "Posielam..."
       public: "Public"
@@ -569,6 +573,7 @@ sk:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Pripojiť Vaše služby"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Upraviť Váš profil"
       finished: "Dokončené!"
       save_and_continue: "Uložiť a pokračovať"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index e1b1745ee16599446f21156eee3f684c389d38b2..530fb8307d03a9c060c5087f9e9e6f0eb344e56e 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -33,6 +33,7 @@ sl:
             username: 
               taken: "is already taken."
   ago: "%{time} nazaj"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ sl:
     mentioned: "has mentioned you in their"
     new_request: "nekdo želi deliti z vami."
     post: "prispevek"
+    private_message: "sent you a message."
     request_accepted: "vaše prošnja je sprejeta."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ sl:
       edit_my_profile: "Uredi moj profil"
       gender: "spol"
       in_aspects: "v skupinah"
+      location: "location"
       remove_contact: "odstrani stik"
       remove_from: "Ali odstranim %{name} iz skupine %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ sl:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ sl:
       add_photos: "dodaj slike"
       all: "vsi"
       all_contacts: "vsi stiki"
+      click_to_share_with: "Click to share with: "
       make_public: "objavi kot javno"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: "Objavljam..."
       public: "Public"
@@ -569,6 +573,7 @@ sl:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Povežite se s servisi"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Uredite vaš profil"
       finished: "Končano!"
       save_and_continue: "Shrani in nadaljuj"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 5d95fee2fdda28cb63321214133c2ca614dda27d..444de25e0e18caf99ccdeb2fc8648066ec4fac73 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -19,7 +19,7 @@ sv:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "är upptaget."
         request: 
           attributes: 
             from_id: 
@@ -33,6 +33,7 @@ sv:
             username: 
               taken: "is already taken."
   ago: "%{time} sedan"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -53,11 +54,11 @@ sv:
     aspect_contacts: 
       done_editing: "dölj"
     aspect_stream: 
-      activity: "activity"
-      post_time: "post time"
-      sort_by: "sort by:"
-    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."
+      activity: "aktivitet"
+      post_time: "skickat "
+      sort_by: "sortera efter:"
+    contacts_not_visible: "Kontakterna på den här sidan kommer inte kunna se varandra."
+    contacts_visible: "Kontakterna på den här sidan kommer kunna se varandra."
     create: 
       failure: "Sidan kunde inte skapas."
       success: "Din nya sida %{name} har skapats"
@@ -65,14 +66,14 @@ sv:
       failure: "%{name} is not empty and could not be removed."
       success: "%{name} är nu borttagen."
     edit: 
-      add_existing: "Add an existing contact"
+      add_existing: "Lägg till en befintlig kontakt"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      confirm_remove_aspect: "Är du säker på att du vill ta bort den här sidan?"
       done: "Done"
       make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
+      remove_aspect: "Ta bort den här sidan"
+      rename: "byt namn"
       update: "update"
       updating: "updating"
     few: "%{count} aspects"
@@ -82,7 +83,7 @@ sv:
       remove: "ta bort"
     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: "No contacts"
+      no_contacts: "Inga kontakter"
     manage: 
       add_a_new_aspect: "Lägg till en ny sida"
       add_a_new_contact: "Lägg till en ny kontakt"
@@ -134,7 +135,7 @@ sv:
     other: "%{count} kontakter"
     share_with_pane: 
       accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
+      add_new_aspect: "lägg till på ny sida"
       share_with: "Start sharing with %{name}"
     zero: "inga kontakter"
   conversations: 
@@ -210,13 +211,13 @@ sv:
       to: "Till"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
-      logged_in_as: "logged in as %{name}"
+      have_a_problem: "Stött på problem? Hitta lösningen här"
+      logged_in_as: "inloggad som %{name}"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile site"
+      toggle: "byt till mobil version"
       whats_new: "några nyheter?"
-      your_aspects: "your aspects"
+      your_aspects: "dina sidor"
     header: 
       blog: "blogg"
       code: "källkod"
@@ -238,7 +239,7 @@ sv:
         one: "1 person liked this"
         other: "%{count} people liked this"
         zero: "no people liked this"
-  more: "More"
+  more: "Mer"
   next: "nästa"
   notifications: 
     also_commented: "kommenterade även din kontakts"
@@ -255,29 +256,30 @@ sv:
     index: 
       and: "and"
       and_others: "and %{number} others"
-      mark_all_as_read: "Mark All as Read"
+      mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
-    mentioned: "has mentioned you in their"
+    mentioned: "har nämnt dig i deras"
     new_request: "erbjöd sig att dela med dig."
     post: "meddelande"
+    private_message: "sent you a message."
     request_accepted: "accepterade din förfrågan om att dela."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
+      commented: "har också kommenterat %{post_author}'s inlägg:"
+      sign_in: "Logga in för att se den."
       subject: "%{name} has also commented."
     comment_on_post: 
       commented: "Har kommenterat ditt inlägg"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      sign_in: "Logga in för att visa den."
+      subject: "%{name} har kommenterat ditt inlägg."
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
     love: "hälsningar,"
     manage_your_email_settings: "manage your email settings"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "nämnde dig i ett inlägg:"
+      sign_in: "Logga in för att kunna se det."
+      subject: "%{name} har nämnt dig på Diaspora*"
     new_request: 
       just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora"
       sign_in: "Logga in här"
@@ -290,7 +292,7 @@ sv:
       subject: "%{name} has sent you a private message yon Diaspora*"
     request_accepted: 
       accepted: "har accepterat din kontaktförfrågan!"
-      sign_in: "Sign in here"
+      sign_in: "Logga in här"
       subject: "%{name} har accepterat din kontaktförfrågan på Diaspora"
     single_admin: 
       admin: "Din Diaspora administratör"
@@ -329,6 +331,7 @@ sv:
       edit_my_profile: "Ändra min profil"
       gender: "kön"
       in_aspects: "på sidor"
+      location: "location"
       remove_contact: "ta bort kontakt"
       remove_from: "Ta bort %{name} från %{aspect}?"
     show: 
@@ -344,7 +347,7 @@ sv:
       recent_public_posts: "Senaste publika inlägg"
       return_to_aspects: "Återgå till översikten"
       similar_contacts: "liknande kontakter"
-      start_sharing: "start sharing"
+      start_sharing: "börja dela"
       to_accept_or_ignore: "for att acceptera eller ignorera."
       you_have_no_tags: "you have no tags!"
     webfinger: 
@@ -378,7 +381,7 @@ sv:
       edit: "ändra"
       edit_delete_photo: "Ändra beskrivning / ta bort bild"
       make_profile_photo: "använd som profilbild"
-      original_post: "Original Post"
+      original_post: "Ursprungligt inlägg"
       permalink: "permalink"
       update_photo: "Uppdatera foto"
       view: "visa"
@@ -391,14 +394,15 @@ sv:
   profile: "Profil"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
+      allow_search: "Tillåter andra att söka efter dig inom Diaspora"
       edit_profile: "Edit profile"
-      first_name: "First name"
+      first_name: "Förnamn"
       last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
+      update_profile: "Uppdatera profil"
+      your_bio: "Din biografi"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -406,8 +410,8 @@ sv:
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Misslyckades att uppdatera profil"
+      updated: "Profilen uppdaterades"
   registrations: 
     closed: "Registreringsformuläret är stäng på den här poden."
     create: 
@@ -456,13 +460,13 @@ sv:
       error: "Det blev ett fel vid anslutning till tjänsten"
     finder: 
       friends: 
-        few: "%{count} friends"
+        few: "%{count} vänner"
         many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
-      not_connected: "not connected"
+        one: "1 vän"
+        other: "%{count} vänner"
+        zero: "inga vänner"
+      invite_your_friends_from: "Bjud in dina vänner från %{service}"
+      not_connected: "inte ansluten"
     index: 
       connect_to_facebook: "Anslut till facebook"
       connect_to_twitter: "Anslut till twitter"
@@ -471,11 +475,11 @@ sv:
       logged_in_as: "inloggad som"
       really_disconnect: "koppla från %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
+      click_link_to_accept_invitation: "Klicka på den här länken för att acceptera din inbjudan"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "bjud in"
+      resend: "skicka igen"
   settings: "Inställningar"
   shared: 
     add_contact: 
@@ -488,12 +492,12 @@ sv:
       all_contacts: "Alla kontakter"
       cannot_remove: "Kan inte ta bort personen från fler sidor, ta bort kontakten om du inte längre vill vara ansluten till denne."
     invitations: 
-      by_email: "by Email"
+      by_email: "by Emaila"
       dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!"
-      from_facebook: "From Facebook"
+      from_facebook: "Från Facebook"
       invitations_left: "(%{count} kvar)"
       invite_someone: "Bjud in en kontakt"
-      invite_your_friends: "Invite your friends"
+      invite_your_friends: "Bjud in dina vänner"
       invites: "Inbjudningar"
       invites_closed: "Inbjudningar är för närvarande stängd på denna Diaspora server"
     notification: 
@@ -507,15 +511,15 @@ sv:
       add_photos: "lägg till bilder"
       all: "alla"
       all_contacts: "alla kontakter"
+      click_to_share_with: "Click to share with: "
       make_public: "gör publik"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
       public: "Public"
       publishing_to: "publishing to: "
       share: "Dela"
       share_with: "dela med"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "vad har du på hjärtat?"
     reshare: 
       reshare: "Ã…terdela"
     stream_element: 
@@ -525,7 +529,7 @@ sv:
     create: 
       success: "Successfully mentioned: %{names}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Misslyckades att ta bort inlägg"
     helper: 
       no_message_to_display: "Inget meddelande att visa."
     new: 
@@ -553,7 +557,7 @@ sv:
       change_password: "Ändra lösenord"
       close_account: "Stäng kontot"
       comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
+      current_password: "Nuvarande lösenord"
       download_photos: "Ladda ner mina foton"
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
@@ -569,16 +573,17 @@ sv:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Anslut till andra tjänster"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Ändra din profil"
       finished: "Slutfört!"
       save_and_continue: "Spara och fortsätt"
       signup_steps: "Slutför registreringen genom att följa den här guiden:"
       skip: "hoppa över guiden"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Vill du kunna se dina Facebook-vänner på Diaspora?"
+        skip: "Hoppa över"
       step_3: 
-        finish: "Finish"
+        finish: "Slutför"
         people_already_on_diaspora: "People already on Diaspora"
       welcome: "Välkommen till diaspora!"
     public: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 85c4d7b6874b90a711c0ccf6a90c65e7eab5960c..5c4f8bece5b4dfde1c1d45d25e9c2138510407d3 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -33,6 +33,7 @@ tr:
             username: 
               taken: "is already taken."
   ago: "%{time} önce"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ tr:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ tr:
       edit_my_profile: "Edit my profile"
       gender: "gender"
       in_aspects: "in aspects"
+      location: "location"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
@@ -399,6 +402,7 @@ tr:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ tr:
       add_photos: "fotoÄŸraf ekle"
       all: "hepsi"
       all_contacts: "bütün kişiler"
+      click_to_share_with: "Click to share with: "
       make_public: "herkese görünür yap"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "mesaj gönder %{aspect}"
       posting: "Posting..."
       public: "Public"
@@ -569,6 +573,7 @@ tr:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Servislerine baÄŸlan"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "Profilini düzenle"
       finished: "Finished!"
       save_and_continue: "Kaydet ve devam et"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index e8f4780f684352a5fd135b511cdd00eff6e3524e..00c0576fa73abc86317e37e836490f7b7efbea7f 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -33,6 +33,7 @@ zh-TW:
             username: 
               taken: "已被使用."
   ago: "%{time}前"
+  all_aspects: "所有面向"
   application: 
     helper: 
       aspect_badge: 
@@ -196,7 +197,7 @@ zh-TW:
       rejected: "下列電子信箱有問題: "
       sent: "邀請函已經寄給: "
     edit: 
-      sign_up: "sign_up"
+      sign_up: "登記"
     new: 
       already_invited: "已邀請了"
       aspect: "面向"
@@ -260,6 +261,7 @@ zh-TW:
     mentioned: "提到了你, 在他們的"
     new_request: "想要跟你分享."
     post: "貼文"
+    private_message: "寫了一則訊息給你."
     request_accepted: "已同意和你分享."
   notifier: 
     also_commented: 
@@ -273,7 +275,7 @@ zh-TW:
     diaspora: "diaspora 電郵機器人"
     hello: "%{name}你好!"
     love: "衷心祝福,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "管理電郵設定"
     mentioned: 
       mentioned: "在貼文中提到你:"
       sign_in: "登入來看看."
@@ -302,7 +304,7 @@ zh-TW:
   password_confirmation: "密碼確認"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "從標籤新增聯繫"
     aspect_list: 
       edit_membership: "編輯所屬面向"
     few: "%{count}個聯絡人"
@@ -329,6 +331,7 @@ zh-TW:
       edit_my_profile: "編輯我的個人檔案"
       gender: "性別"
       in_aspects: "所屬面向"
+      location: "位置"
       remove_contact: "刪除聯繫"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
@@ -399,6 +402,7 @@ zh-TW:
       your_bio: "你的自我介紹"
       your_birthday: "你的生日"
       your_gender: "你的性別"
+      your_location: "你的位置"
       your_name: "你的名字"
       your_photo: "你的相片"
       your_private_profile: "你的私人檔案"
@@ -507,11 +511,11 @@ zh-TW:
       add_photos: "加入相片"
       all: "全部"
       all_contacts: "全部的聯繫"
+      click_to_share_with: "點一下以一起分享: "
       make_public: "公開"
-      mention_helper_text: "想提到某人的話, 先敲 '@' 再接著打他們的名字"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
-      public: "Public"
+      public: "公開"
       publishing_to: "發表至: "
       share: "分享"
       share_with: "與他/她分享:"
@@ -532,7 +536,7 @@ zh-TW:
       mentioning: "提及發表中: %{person}"
     show: 
       destroy: "刪除"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "抱歉, 找不到該則貼文."
       permalink: "靜態連結"
   stream_helper: 
     hide_comments: "隱藏意見"
@@ -558,17 +562,18 @@ zh-TW:
       download_xml: "下載我的 xml"
       edit_account: "編輯帳號"
       export_data: "資料匯出"
-      mentioned: "...當貼文中有提到你時?"
+      mentioned: "...當貼文中提到你時?"
       new_password: "新的密碼"
-      private_message: "...當你收到私人訊息時?"
-      receive_email_notifications: "要在以下時機透過電子郵件接收消息..."
-      request_acceptence: "...當你想跟人分享的請求被接受時?"
-      request_received: "...當你收到有人想跟你分享的新請求時?"
+      private_message: "...當收到私人訊息時?"
+      receive_email_notifications: "是否要在以下時機透過電子郵件接收消息..."
+      request_acceptence: "...當請求跟人分享被接受時?"
+      request_received: "...當收到有人想跟你分享的新請求時?"
       your_email: "你的電子郵件"
       your_handle: "你的 diaspora 識別碼"
     getting_started: 
       connect_on_diaspora: "連上 Diaspora"
       connect_services: "連結至你使用的其他服務"
+      could_not_find_anyone: "在 Diaspora* 上找不到任何朋友. 請使用朋友搜尋器來邀請他/她們."
       edit_profile: "編輯個人檔案"
       finished: "完成!"
       save_and_continue: "儲存並繼續"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index 135edb8d22de69bdda17214019fed308daacf956..16de3d9bd2b0e15b0336faf6d5422234ef51efb4 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -33,6 +33,7 @@ zh:
             username: 
               taken: "is already taken."
   ago: "%{time}以前"
+  all_aspects: "All aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -260,6 +261,7 @@ zh:
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "发布"
+    private_message: "sent you a message."
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
@@ -329,6 +331,7 @@ zh:
       edit_my_profile: "编辑我的个人资料"
       gender: "性别"
       in_aspects: "在分组中"
+      location: "location"
       remove_contact: "删除联系人"
       remove_from: "真的要把%{name}从%{aspect}中删除吗?"
     show: 
@@ -399,6 +402,7 @@ zh:
       your_bio: "Your bio"
       your_birthday: "Your birthday"
       your_gender: "Your gender"
+      your_location: "Your location"
       your_name: "Your name"
       your_photo: "Your photo"
       your_private_profile: "Your private profile"
@@ -507,8 +511,8 @@ zh:
       add_photos: "增加照片"
       all: "所有"
       all_contacts: "所有联系人"
+      click_to_share_with: "Click to share with: "
       make_public: "改为公开"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "发送信息给%{aspect}这个分组的所有人"
       posting: "发布中"
       public: "Public"
@@ -569,6 +573,7 @@ zh:
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "关联您的其他服务"
+      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
       edit_profile: "编辑您的个人资料"
       finished: "结束!"
       save_and_continue: "保存并继续"