diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 431f6b7519795cdd49b3a1c6f8cb5fbb0c914e0f..c04fd211036d58167619bac98323525241c46e06 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -118,6 +118,11 @@ ar:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Eliminar"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ ar:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "لا يوجد رسالة لعرضها"
     new_status_message: 
@@ -451,32 +458,19 @@ ar:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
       edit_profile: "Editar tu perfil"
       finished: "Finished!"
       save_and_continue: "Save and continue"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index d70ec1fb7d03fe0e03376f6e893fef4d4e0b564d..ed4d979456951d57a68bc4663f4f87df34aef7bd 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -118,6 +118,11 @@ ca:
     one: "1 contacte"
     other: "%{count} contactes"
     zero: "no hi ha contactes"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Borrar"
   email: "Correu electrònic"
   error_messages: 
@@ -420,6 +425,8 @@ ca:
     reshare: 
       reshare: "Compartir de nuevo"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
     new_status_message: 
@@ -451,32 +458,19 @@ ca:
       your_email: "Tu email"
       your_handle: "Tu dirección Diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conectar a otros servicios"
-      define_aspects: "Define tus aspectos"
       edit_profile: "Editar tu perfil"
       finished: "Finalizado!"
       save_and_continue: "Guardar y continuar"
       signup_steps: "Completa tu inscripción completando estos tres pasos:"
       skip: "saltarse la configuración inicial"
       step_2: 
-        add: "Añadir"
-        aspect_name: "Nombre del aspecto"
-        description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
-        drag_to_add: "Arrastralos al aspecto de ti al que pertenezcan"
-        no_requests: "No tienes nuevas peticiones"
-        your_aspects: "Tus aspectos"
-        your_inviter: "Estas son las personas que estan esperando por ti:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Puedes conectar tus redes sociales existentes con tu cuenta Diaspora. Podrás realizar posts públicos desde tu Inicio cuando selecciones \"hacer público\""
-        your_services: "Tus servicios"
-      step_4: 
-        change_profile: "Puedes editar tu perfil y configurar tus servicios conectados en cualquier momento."
-        continue: "Continúa en tu página de Inicio, un resumen de todos tus aspectos."
-        finish: "Finalizar"
-        manage_aspects: "También puedes agregar varios contactos al mismo tiempo en una página de aspecto."
-        ready_to_share: "Ya puedes comenzar a compartir con"
-        set_up: "Ya estás listo, %{name}!"
-        user_menu: "el menú de usuario está localizado arriba a la derecha."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "¡Bienvenido a Diaspora!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index d6c99801513a67e236a00db2a696f4b8748171c8..4bca25fae81957a390c8e589cb14f3267c46876e 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -118,6 +118,11 @@ cs:
     one: "1 kontakt"
     other: "%{count} kontaktů"
     zero: "žádné kontakty"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Smazat"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ cs:
     reshare: 
       reshare: "Přesdílet"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Není k zobrazení žádná zpráva."
     new_status_message: 
@@ -451,32 +458,19 @@ cs:
       your_email: "Váš email"
       your_handle: "Váše identifikace na Diaspoře"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Připojit vaše další služby"
-      define_aspects: "Definujte vaše aspekty"
       edit_profile: "Upravit váš profil"
       finished: "Dokončeno!"
       save_and_continue: "Uložit a pokračovat"
       signup_steps: "Dokončete registraci vyplněním těchto tří kroků:"
       skip: "přeskočit průvodce"
       step_2: 
-        add: "Přidat"
-        aspect_name: "Název aspektu"
-        description: "Řekněte Diaspoře, které kontakty chcete vidět v různých aspektech. Aspekty můžete později upravit pomocí menu vpravo nahoře. Vaše aspekty jsou jedinečné a nejsou viditelné ostatními."
-        drag_to_add: "Přetáhněte je do patřičného aspektu"
-        no_requests: "Nemáte žádné žádosti"
-        your_aspects: "Vaše aspekty"
-        your_inviter: "Zde jsou lidé, kteří na vás čekají:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Můžete připojit existující sociální sítě ke svému účtu na Diaspoře. Budete mít možnost posílat příspěvky veřejně prostřednictvím domovské stránky, když vyberete \"zveřejnit\""
-        your_services: "Vaše služby"
-      step_4: 
-        change_profile: "Můžete kdykoliv upravovat svůj profil a spravovat související služby"
-        continue: "Pokračujte na domovské stránce na přehledu o všech svých aspektech."
-        finish: "Dokončit"
-        manage_aspects: "Můžete také přidat kontakty na jakékoliv stránce aspektu."
-        ready_to_share: "Nyní jste připraveni začít sdílet s"
-        set_up: "VÅ¡e je nastaveno, %{name}!"
-        user_menu: "uživatelské menu je umístěno vpravo nahoře."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Vítejte na Diaspoře!"
     public: 
       does_not_exist: "Uživatel %{username} neexistuje!"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 625357ab8cdcb19ee94711ad48bdd8e876c69746..1b087c53fd4065ad6093e1f9a39e865b26aceb81 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -118,6 +118,11 @@ cy:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ cy:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No message to display."
     new_status_message: 
@@ -451,32 +458,19 @@ cy:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "User %{username} does not exist!"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 3b14d714fe12f54982e32a533472a863691fef9e..628eed827cf8b717b3156420169e4af411204cd2 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -118,6 +118,11 @@ da:
     one: "Én kontaktperson"
     other: "%{count} kontaktpersoner"
     zero: "Ingen kontaktpersoner"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Slet"
   email: "E-mail"
   error_messages: 
@@ -420,6 +425,8 @@ da:
     reshare: 
       reshare: "Del igen"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Ingen beskeder at vise."
     new_status_message: 
@@ -451,32 +458,19 @@ da:
       your_email: "Din e-mail"
       your_handle: "Dit diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Tilslut dine eksisterende tjenester"
-      define_aspects: "Definér dine aspekter"
       edit_profile: "Redigér din profil"
       finished: "Færdig!"
       save_and_continue: "Gem og fortsæt"
       signup_steps: "Fuldfør din tilmelding ved at gøre følgende:"
       skip: "spring kom godt i gang over"
       step_2: 
-        add: "Tilføj"
-        aspect_name: "Aspektsnavn"
-        description: "Fortæl Diaspora hvilke forskellige aspekter dine kontakter kan opdeles i. Du kan administrere disse senere ved at klikke på administrér fanen øverst til højre. Dine aspekter er unikke og er ikke synlige for andre."
-        drag_to_add: "Træk dem til det aspekt af dig de kender"
-        no_requests: "Du har ingen anmodninger"
-        your_aspects: "Dine aspekter"
-        your_inviter: "Her er personerne der venter på dig:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Tilslut dine eksisterende sociale netværk til din Diaspora konto. Du vil være i stand til at sende offentligt gennem din Hjemme fane, når du vælger \"offentliggør\"."
-        your_services: "Dine tjenester"
-      step_4: 
-        change_profile: "Du kan altid ændre din profil og dine tjenester ved at klikke på"
-        continue: "Forsæt til din start side. En oversigt over alle dine aspekter."
-        finish: "Slut"
-        manage_aspects: "Du kan altid administrere dine aspekter ved at klikke på"
-        ready_to_share: "Du er nu klar til at dele med"
-        set_up: "Du er nu helt klar, %{name}!"
-        user_menu: "i din brugermenu (øverst til højre)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Velkommen til Diaspora!"
     public: 
       does_not_exist: "Brugeren %{username} findes ikke!"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 9554e3d71799263f6142693773d63df5ccd4e89d..3d570cae10a3c9e14f5d5c550f213925a09bb4e1 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -118,6 +118,11 @@ de:
     one: "1 Kontakt"
     other: "%{count} Kontakte"
     zero: "keine Kontakte"
+  date: 
+    formats: 
+      birthday: "%d. %B"
+      birthday_with_year: "%d. %B %Y"
+      fullmonth_day: "%d. %B"
   delete: "Löschen"
   email: "E-Mail"
   error_messages: 
@@ -420,6 +425,8 @@ de:
     reshare: 
       reshare: "Erneut senden an"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Keine Nachricht zum Anzeigen."
     new_status_message: 
@@ -451,32 +458,19 @@ de:
       your_email: "Deine E-Mail-Adresse"
       your_handle: "Deine Diaspora-Adresse"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Mit deinen anderen Diensten verbinden"
-      define_aspects: "Erstelle deine Aspekte"
       edit_profile: "Bearbeite dein Profil"
       finished: "Fertig!"
       save_and_continue: "Speichern und weiter"
       signup_steps: "Erledige folgende drei Schritte, um deine Registrierung zu vervollständigen:"
       skip: "Erste Schritte überspringen"
       step_2: 
-        add: "Hinzufügen"
-        aspect_name: "Name des Aspekts"
-        description: "Sage Diaspora, welche deiner verschiedenen Aspekte von verschiedenen Kontakten gesehen werden sollen. Du kannst diese später verwalten, indem du auf dein Konto oben rechts klickst. Deine Aspekte sind nur für dich und nicht für andere sichtbar."
-        drag_to_add: "Ziehe sie in einen deiner Aspekte"
-        no_requests: "Du hast keine Anfragen"
-        your_aspects: "Deine Aspekte"
-        your_inviter: "Hier sind die Leute, die auf dich warten:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Du kannst deine vorhandenen sozialen Netzwerke mit deinem Diaspora-Konto verbinden. Du kannst deine Beiträge auch außerhalb von Diaspora veröffentlichen, wenn du „öffentlich machen“ auswählst."
-        your_services: "Deine Dienste"
-      step_4: 
-        change_profile: "Du kannst dein Profil und deine verlinkten Dienste jederzeit bearbeiten unter"
-        continue: "Weiter zur Startseite, einer Ãœbersicht aller deiner Aspekte."
-        finish: "Fertigstellen"
-        manage_aspects: "Du kannst auch Kontakte hinzufügen, während du dich auf einer Aspekt-Seite befindest."
-        ready_to_share: "Du bist nun bereit zum Teilen mit"
-        set_up: "Du bist nun bereit, %{name}!"
-        user_menu: "das Benutzer-Menü oben rechts."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Willkommen bei Diaspora!"
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f22d1a11b13b76d4d27117e51ac0b6f4585bb337..71a13f3b04e68c0266928e3597db1e364d33bdd4 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -118,6 +118,11 @@ el:
     one: "1 επαφή"
     other: "%{count} επαφές"
     zero: "καμία επαφή"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Διαγραφή"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ el:
     reshare: 
       reshare: "Μοιράσου και πάλι"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Κανένα μήνυμα"
     new_status_message: 
@@ -451,32 +458,19 @@ el:
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Συνδεθείτε με άλλες υπηρεσίες"
-      define_aspects: "Ορίστε τις πτυχές σας"
       edit_profile: "Επεξεργασία του προφίλ σας"
       finished: "Τέλος!"
       save_and_continue: "Αποθήκευση και συνέχεια"
       signup_steps: "Ολοκληρώστε την εγγραφή σας συμπληρώνοντας τα παρακάτω τρία βήματα:"
       skip: "παράλειψη της εισαγωγής"
       step_2: 
-        add: "Προσθήκη"
-        aspect_name: "Όνομα πτυχής"
-        description: "Ενημερώστε το Diaspora σχετικά με το ποιες πτυχές του προφίλ σας θα βλέπουν οι φίλοι σας. Μπορείτε να τις επεξεργαστείτε αργότερα μέσω των ρυθμίσεων του λογαριασμού στο πάνω δεξί άκρο του παραθύρου αυτού. Οι πτυχές σας είναι μοναδικές σε εσάς και δεν είναι ορατές σε άλλους. "
-        drag_to_add: "Σύρετε τα άτομα στις πτυχές που ταιριάζουν"
-        no_requests: "Δεν έχετε αιτήματα"
-        your_aspects: "Οι πτυχές σας"
-        your_inviter: "Εδώ είναι τα άτομα που σας περιμένουν:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Μπορείτε να συνδέσετε τους λογαριασμούς σας σε άλλα κοινωνικά δίκτυα με το λογαριασμό σας στο Diaspora. Θα μπορείτε να δημοσιεύσετε μέσω της Αρχικής σελίδας σας όταν επιλέγετε \"δημοσιοποίησε\""
-        your_services: "Οι υπηρεσίες σας"
-      step_4: 
-        change_profile: "Μπορείτε να επεξεργαστείτε το προφίλ σας και να διαχειριστείτε τις σχετικές υπηρεσίες ανά πάσα στιγμή μέσω"
-        continue: "Συνεχίστε στην Αρχική σελίδα, μια επισκόπηση όλων των πτυχών σας."
-        finish: "Τέλος"
-        manage_aspects: "Μπορείτε επίσης να προσθέσετε επαφές, ενώ βρίσκεστε σε οποιαδήποτε σελίδα πτυχής."
-        ready_to_share: "Είστε έτοιμοι να ξεκινήσετε τον διαμοιρασμό με τον χρήστη"
-        set_up: "Είστε έτοιμος/η, %{name}!"
-        user_menu: "το μενού χρήστη που βρίσκεται επάνω δεξιά."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Καλώς ήλθατε στο Diaspora!"
     public: 
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 91e75a25b6bf70e4f8e2e74698ba1a5231dc2462..6ffe543a30aee8af3756fed122992daf0777b281 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -118,6 +118,11 @@ en_shaw:
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     zero: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "𐑛𐑦𐑤𐑰𐑑"
   email: "𐑦-𐑥𐑱𐑤"
   error_messages: 
@@ -420,6 +425,8 @@ en_shaw:
     reshare: 
       reshare: "𐑮𐑦𐑖𐑺"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱."
     new_status_message: 
@@ -451,32 +458,19 @@ en_shaw:
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑿𐑼 𐑳𐑞𐑼 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
-      define_aspects: "𐑛𐑦𐑓𐑲𐑯 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
       edit_profile: "𐑧𐑛𐑦𐑑 𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤"
       finished: "𐑓𐑦𐑯𐑦𐑖𐑑!"
       save_and_continue: "𐑕𐑱𐑝 𐑯 𐑒𐑩𐑯𐑑𐑦𐑯𐑿"
       signup_steps: "𐑓𐑦𐑯𐑦𐑖 𐑿𐑼 𐑕𐑲𐑯 𐑳𐑐 𐑚𐑲 𐑒𐑩𐑥𐑐𐑤𐑰𐑑𐑦𐑙 𐑞𐑰𐑟 𐑔𐑮𐑰 𐑕𐑑𐑧𐑐𐑕:"
       skip: "𐑕𐑒𐑦𐑐 𐑜𐑧𐑑𐑦𐑙 𐑕𐑑𐑸𐑑𐑩𐑛"
       step_2: 
-        add: "𐑨𐑛"
-        aspect_name: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑯𐑱𐑥"
-        description: "𐑑𐑧𐑤 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑢𐑪𐑑 𐑛𐑦𐑓𐑮𐑩𐑯𐑑 𐑨𐑕𐑐𐑧𐑒𐑑𐑕 𐑝 𐑿 𐑸 𐑕𐑰𐑯 𐑚𐑲 𐑛𐑦𐑓𐑮𐑩𐑯𐑑 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕. 𐑿 𐑒𐑨𐑯 𐑥𐑨𐑯𐑩𐑡 𐑞𐑰𐑟 𐑤𐑱𐑑𐑼 𐑔𐑮𐑵 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑥𐑧𐑯𐑿 𐑨𐑑 𐑞 𐑑𐑪𐑐 𐑮𐑲𐑑. 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕 𐑸 𐑿𐑯𐑰𐑒 𐑑 𐑿 𐑯 𐑯𐑪𐑑 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟."
-        drag_to_add: "𐑛𐑮𐑨𐑜 𐑞𐑧𐑥 𐑑 𐑞 𐑨𐑕𐑐𐑧𐑒𐑑 𐑝 𐑿𐑼𐑕𐑧𐑤𐑓 𐑞𐑱 𐑯𐑴"
-        no_requests: "𐑿 𐑣𐑨𐑝 𐑯𐑴 𐑮𐑦𐑒𐑢𐑧𐑕𐑑𐑕"
-        your_aspects: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        your_inviter: "𐑣𐑽 𐑸 𐑞 𐑐𐑰𐑐𐑩𐑤 𐑣𐑵 𐑸 𐑢𐑱𐑑𐑦𐑙 𐑓𐑹 𐑿:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "𐑿 𐑸 𐑱𐑚𐑩𐑤 𐑑 𐑒𐑩𐑯𐑧𐑒𐑑 𐑿𐑼 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑕𐑴𐑖𐑩𐑤 𐑯𐑧𐑑𐑢𐑼𐑒𐑕 𐑑 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑. 𐑿 𐑢𐑦𐑤 𐑚𐑰 𐑱𐑚𐑩𐑤 𐑑 𐑐𐑴𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑒𐑤𐑦 𐑔𐑮𐑵 𐑿𐑼 𐑞𐑴𐑥 𐑐𐑱𐑡 𐑢𐑧𐑯 𐑿 𐑕𐑩𐑤𐑧𐑒𐑑 \"𐑥𐑱𐑒 𐑐𐑳𐑚𐑤𐑦𐑒\""
-        your_services: "𐑿𐑼 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
-      step_4: 
-        change_profile: "𐑿 𐑒𐑨𐑯 𐑧𐑛𐑦𐑑 𐑿𐑼 𐑐𐑮𐑴𐑓𐑲𐑤 𐑯 𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑕𐑻𐑝𐑦𐑕𐑩𐑟 𐑨𐑑 𐑨𐑯𐑦 𐑑𐑲𐑥 𐑔𐑮𐑵"
-        continue: "𐑒𐑩𐑯𐑑𐑦𐑯𐑿 𐑪𐑯 𐑑 𐑿𐑼 𐑣𐑴𐑥 𐑐𐑱𐑡, 𐑩𐑯 𐑴𐑝𐑼𐑝𐑿 𐑝 𐑷𐑤 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕."
-        finish: "𐑓𐑦𐑯𐑦𐑖"
-        manage_aspects: "𐑿 𐑒𐑨𐑯 𐑷𐑤𐑕𐑴 𐑨𐑛 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑢𐑲𐑤 𐑪𐑯 𐑨𐑯𐑦 𐑨𐑕𐑐𐑧𐑒𐑑 𐑐𐑱𐑡."
-        ready_to_share: "𐑿𐑮 𐑯𐑬 𐑮𐑧𐑛𐑦 𐑑 𐑕𐑑𐑸𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞"
-        set_up: "𐑿𐑮 𐑷𐑤 𐑕𐑧𐑑 𐑳𐑐, %{name}!"
-        user_menu: "𐑞 𐑿𐑟𐑼 𐑥𐑧𐑯𐑿 𐑤𐑴𐑒𐑱𐑑𐑩𐑛 𐑨𐑑 𐑞 𐑑𐑪𐑐 𐑮𐑲𐑑."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "𐑢𐑧𐑤𐑒𐑩𐑥 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
     public: 
       does_not_exist: "𐑿𐑟𐑼 %{username} 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 630bafcf57d34c6dd171d62b01c2a1a30656c048..2b56e1da3eccec16a6d2a925e72ca7a59813edf4 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -118,6 +118,11 @@ eo:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ eo:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No message to display."
     new_status_message: 
@@ -451,32 +458,19 @@ eo:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your other services"
-      define_aspects: "Define your aspects"
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
       signup_steps: "Finish your sign up by completing these three steps:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public\""
-        your_services: "Your services"
-      step_4: 
-        change_profile: "You can edit your profile and manage your connected services at any time through "
-        continue: "Continue on to your Home page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can also add contacts while on any aspect page."
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "the user menu located at the top right."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "User %{username} does not exist!"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 04afc1367a70de9618d0ad7395b2621264187fec..490675ea5ccffe4d436b1f170d6ec0dd7ef7e31f 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -118,6 +118,11 @@ es-CL:
     one: "1 contacto"
     other: "%{count} contactos"
     zero: "no hay contactos"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Borrar"
   email: "Correo electrónico"
   error_messages: 
@@ -420,6 +425,8 @@ es-CL:
     reshare: 
       reshare: "Compartir de nuevo"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No hay mensaje que mostrar."
     new_status_message: 
@@ -451,32 +458,19 @@ es-CL:
       your_email: "Tu correo electrónico"
       your_handle: "Tu dirección diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conectar tus otros servicios"
-      define_aspects: "Definir tus aspectos"
       edit_profile: "Editar tu perfil"
       finished: "¡Terminaste!"
       save_and_continue: "Guardar y continuar"
       signup_steps: "Finaliza tu registro completando estos tres pasos:"
       skip: "saltarse la configuración inicial"
       step_2: 
-        add: "Agregar"
-        aspect_name: "Nombre del aspecto"
-        description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
-        drag_to_add: "Arrástralos al aspecto que ellos conocen de ti mismo"
-        no_requests: "No tienes solicitudes"
-        your_aspects: "Tus aspectos"
-        your_inviter: "Aquí está la gente que te está esperando:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Puedes conectar tus redes sociales existentes a tu cuenta Diaspora. Podrás realizar posteos públicos desde tu Inicio cuando selecciones \"hacer público\""
-        your_services: "Tus servicios"
-      step_4: 
-        change_profile: "Puedes editar tu perfil y configurar tus servicios conectados en cualquier momento."
-        continue: "Continúa en tu página de Inicio, un resúmen de todos tus aspectos."
-        finish: "Finalizar"
-        manage_aspects: "También puedes agregar varios contactos al mismo tiempo en cualquier página de aspecto."
-        ready_to_share: "Ya puedes empezar a compartir con"
-        set_up: "¡Ya estás listo, %{name}!"
-        user_menu: "el menú de usuario se encuentra en la esquina superior derecha."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "¡Bienvenido a Diaspora!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 66b8f594b1c448e276e3550f151ef2d23ab2b6d7..4524b085f59343e3bf2e1d82c5b8da14ccd7ec77 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -118,6 +118,11 @@ es:
     one: "1 contacto"
     other: "%{count} contactos"
     zero: "no hay contactos"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Eliminar"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ es:
     reshare: 
       reshare: "Compartir también en..."
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
     new_status_message: 
@@ -451,32 +458,19 @@ es:
       your_email: "Tu dirección de email"
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conectar con otros Servicios"
-      define_aspects: "Define tus Aspectos"
       edit_profile: "Editar tu Perfil"
       finished: "¡Finalizado!"
       save_and_continue: "Guardar y continuar"
       signup_steps: "Termina tu registro en tres pasos:"
       skip: "Saltarse la configuración inicial"
       step_2: 
-        add: "Añadir"
-        aspect_name: "Nombre del Aspecto"
-        description: "Dile a Diaspora* en qué Aspectos se dividen tus diferentes contactos. Podras añadir y editarlos más tarde, haciendo click en la parte superior derecha. Tus Aspectos solo son vistos por ti."
-        drag_to_add: "Muévelos al Aspecto que encajen mejor o crea uno nuevo."
-        no_requests: "No tienes nuevas solicitudes"
-        your_aspects: "Tus Aspectos"
-        your_inviter: "Esta gente está esperándote:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Puedes conectar tus redes sociales existentes con tu cuenta Diaspora*. Publicando desde Inicio y activando la casilla \"Publicar\""
-        your_services: "Tus Servicios"
-      step_4: 
-        change_profile: "Puedes editar tu Perfil y configurar tus Servicios conectados en cualquier momento."
-        continue: "Junto a Inicio, hay una lista de todos tus Aspectos."
-        finish: "Finalizar"
-        manage_aspects: "También puedes agregar varios contactos al mismo tiempo en una página de Aspecto."
-        ready_to_share: "Ya puedes comenzar a compartir con"
-        set_up: "Ya está listo, %{name}!"
-        user_menu: "El menú de usuario está localizado arriba a la derecha."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "¡Bienvenido a Diaspora*!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 52ab4a4e5701f1ec29c335275575a9eebda108cb..a5c396474093832984d0b1324f597ed5138bbfcc 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -118,6 +118,11 @@ fi:
     one: "1 kontakti"
     other: "%{count} kontaktia"
     zero: "ei kontakteja"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Poista"
   email: "Sähköposti"
   error_messages: 
@@ -165,7 +170,7 @@ fi:
       have_a_problem: "Ongelmia? Löydä ratkaisu täältä"
       logged_in_as: "kirjautuneena nimellä %{name}"
       powered_by: "PALVELUN TARJOAA DIASPORA*"
-      toggle: "toggle mobile site"
+      toggle: "vaihda mobiili sivustoon"
       whats_new: "Uutta"
       your_aspects: "näkymäsi"
     header: 
@@ -307,7 +312,7 @@ fi:
     photo: 
       view_all: "näytä kaikki käyttäjän %{name} kuvat"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "tallenna pysyvä linkki"
       delete_photo: "Poista kuva"
       edit: "muokkaa"
       edit_delete_photo: "Muokkaa kuvan kuvausta / poista kuva"
@@ -420,6 +425,8 @@ fi:
     reshare: 
       reshare: "Jaa uudelleen"
   status_messages: 
+    destroy: 
+      failure: "Viestin poisto epäonnistui"
     helper: 
       no_message_to_display: "Ei näytettäviä viestejä."
     new_status_message: 
@@ -451,32 +458,19 @@ fi:
       your_email: "Sähköpostiosoitteesi"
       your_handle: "Diaspora-tunnuksesi"
     getting_started: 
+      connect_on_diaspora: "Yhdistä Diasporaan"
       connect_services: "Yhdistä muut palvelusi"
-      define_aspects: "Määritä näkymäsi"
       edit_profile: "Muokkaa profiiliasi"
       finished: "Valmis!"
       save_and_continue: "Tallenna ja jatka"
       signup_steps: "Viimeistele rekisteröitymisesi näiden kolmen vaiheen kautta:"
       skip: "ohita aloitusohjeet"
       step_2: 
-        add: "Lisää"
-        aspect_name: "Näkymän nimi"
-        description: "Kerro Diasporalle mitä näkymiä näytetään kontakteillesi. Voit muokata näitä asetuksia myöhemmin yläoikealta löytyvän valikon kautta. Näkymäsi ovat yksilöllisiä sinulle, eikä niitä näytetä muille. "
-        drag_to_add: "Raahaa heidät näkymään itsestäsi, jonka he tietävät"
-        no_requests: "Ei pyyntöjä"
-        your_aspects: "Näkymäsi"
-        your_inviter: "Tässä ovat sinua odottavat henkilöt:"
+        find_your_friends_on_diaspora: "Haluatko löytää Facebook kaverisi Diasporassa?"
+        skip: "Ohita"
       step_3: 
-        description: "Voit yhdistää käyttämäsi yhteisöpalvelut Diaspora-käyttäjätiliisi. Sinun on mahdollista lähettää ulospäin julkisia viestejä etusivulta valitsemalla \"tee julkiseksi.\""
-        your_services: "Palvelusi"
-      step_4: 
-        change_profile: "Voit muokata profiiliasi ja hallita yhdistettyjä palveluitasi koska tahansa valitsemalla "
-        continue: "Jatka etusivulle, joka tarjoaa katsauksen kaikkiin näkymiisi."
-        finish: "Valmis"
-        manage_aspects: "Voit myös lisätä kontakteja ollessasi missä hyvänsä näkymässä."
-        ready_to_share: "Olet nyt valmis aloittamaan jakamisen henkilöille"
-        set_up: "Olet nyt asettanut kaiken, %{name}!"
-        user_menu: "käyttäjävalikko yläoikealla."
+        finish: "Viimeistely"
+        people_already_on_diaspora: "Diasporassa jo olevat henkilöt"
       welcome: "Tervetuloa Diasporaan!"
     public: 
       does_not_exist: "Käyttäjää %{username} ei ole olemassa!"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index eda274bcbe5752706f0446311e586a270c735fc8..96dd8b8688193e9b0aeaaa2af37be62caa67365f 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -118,6 +118,11 @@ fr:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "aucun contact"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Supprimer"
   email: "E-mail"
   error_messages: 
@@ -420,6 +425,8 @@ fr:
     reshare: 
       reshare: "Repartager"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Aucun message à afficher."
     new_status_message: 
@@ -451,32 +458,19 @@ fr:
       your_email: "Votre adresse électronique"
       your_handle: "Votre handle diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connectez vos autres services"
-      define_aspects: "Définissez vos aspects"
       edit_profile: "Modifiez votre profil"
       finished: "Terminé !"
       save_and_continue: "Enregistrer et continuer"
       signup_steps: "Terminez votre inscription en suivant ces trois étapes :"
       skip: "passer la présentation"
       step_2: 
-        add: "Ajouter"
-        aspect_name: "Nom de l'aspect"
-        description: "Signalez à Diaspora quels différents aspects sont vus par différents contacts. Vous pourrez plus tard gérer ceux-ci en allant sur votre menu de compte en haut à droite. Vos aspects vous sont spécifiques et ne sont pas visibles pour les autres."
-        drag_to_add: "Déplacez-les dans l'aspect de votre vie qui leur correspond"
-        no_requests: "Vous n'avez pas de requêtes"
-        your_aspects: "Vos aspects"
-        your_inviter: "Personnes en attente d'une réponse de votre part :"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Vous pouvez connecter vos réseaux sociaux existants à votre compte Diaspora. Vous pourrez publier publiquement depuis votre page d'accueil en sélectionnant « rendre public »"
-        your_services: "Vos services"
-      step_4: 
-        change_profile: "Vous pouvez modifier votre profil et gérer vos services connectés à tout moment via"
-        continue: "Continuez sur votre page d'accueil, qui représente un aperçu de tous vos aspects."
-        finish: "Terminer"
-        manage_aspects: "Vous pouvez également ajouter des contacts sur chacune de vos pages d'aspect."
-        ready_to_share: "Vous êtes maintenant prêt(e) à partager avec "
-        set_up: "Tout est prêt, %{name} !"
-        user_menu: "le menu utilisateur situé en haut à droite."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Bienvenue sur Diaspora !"
     public: 
       does_not_exist: "L'utilisateur %{username} n'existe pas !"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index c4ab764e27e52795677eb5faa0b4b1bac3909b68..9892853d8295336258b4ae0ed5e3c5b0953dd3e1 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -118,6 +118,11 @@ ga:
     one: "teagmháil amháin"
     other: "%{count} teagmháil"
     zero: "níl aon teagmháila"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Scrios"
   email: "Sheoladh ríomhphost"
   error_messages: 
@@ -420,6 +425,8 @@ ga:
     reshare: 
       reshare: "Roinn arís"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Níl aon teachtaireacht chun taispeáint."
     new_status_message: 
@@ -451,32 +458,19 @@ ga:
       your_email: "Do seola ríomhphost"
       your_handle: "Do hanla diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Ceangailt do seirbhísí eile"
-      define_aspects: "Sainmhínigh do gné"
       edit_profile: "Athraigh do próifíl"
       finished: "Críochnaithe!"
       save_and_continue: "Sáibháil agus leanúint ar aghaidh"
       signup_steps: "Críochnaigh do síniú isteach ó ag leanúint na treotracha seo"
       skip: "scipeáil na céad treoracha"
       step_2: 
-        add: "Cuir leis"
-        aspect_name: "Ainm an gné"
-        description: "Abair le Diaspora cén gnéanna duit féin a bhfuil le bhfeiceáil ag teagmháilí éagsúla. Is féidir iad seo a athrú níos déanaí tríd do roghclár cúntas ag an barr ar clé. Tá do gnéanna uathúil duitse agus ní féidir le daoine eile iad a fheiceáil."
-        drag_to_add: "Tarraing iad chuig na gnéanna duit féin a bhfuil fhios acu"
-        no_requests: "Níl aon iarratais agat"
-        your_aspects: "Do gné"
-        your_inviter: "Seo iad na daoine atá ag fanacht ort:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Is féidir leat ceangailt do líonraí sosialta eile chuig do cúntas Diaspora. Beidh tú ábalta postanna phoiblí a dhéanamh tríd do leathanach Baile nuair a roghnaíonn tú “déan phoiblí”"
-        your_services: "Do seirbhísí"
-      step_4: 
-        change_profile: "Is féidir leat do próifíl a athrú agus bhainistú do seirbhísí ceangailte ag aon am tríd "
-        continue: "Lean chuig do leathanach Baile, forbhreatnú do do gnéana go léir"
-        finish: "Críochnaigh"
-        manage_aspects: "Is féidir leat teagmháilaí a cuiir leis ar aon leathanach."
-        ready_to_share: "Tá tú ré chun tosnú ag roint le "
-        set_up: "Tá tú díreach críochnaithe, %{name}!"
-        user_menu: "an roghclár úsáidoíra ag an barr ar clé."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "Níl aon úsáidóira, %{username}!"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl-ES.yml
index 91e2e60d8b1d160a8d87a6f9958414b34b13ae08..c123e7da733ad95c8765f37e49b8cb96237ecc99 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl-ES.yml
@@ -118,6 +118,11 @@ gl-ES:
     one: "1 contacto"
     other: "%{count} contactos"
     zero: "non hai contactos"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Borrar"
   email: "Correo-e"
   error_messages: 
@@ -420,6 +425,8 @@ gl-ES:
     reshare: 
       reshare: "Recompartir "
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Non hai mensaxes para amosar"
     new_status_message: 
@@ -451,32 +458,19 @@ gl-ES:
       your_email: "O teu correo"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conectar a outros servizos"
-      define_aspects: "Define os teus aspectos"
       edit_profile: "Edita o teu perfil"
       finished: "Xa está!"
       save_and_continue: "Gardar e continuar"
       signup_steps: "Remata de rexistrarte completando estes tres pasos"
       skip: "saltar guía de comezo"
       step_2: 
-        add: "Engadir"
-        aspect_name: "Nome do aspecto"
-        description: "Dille a Diaspora que diferentes aspectos teus son vistos por diferentes contactos. Podes administralos máis tarde no teu menú de conta arriba á dereita. Os teu aspectos son únicos e so visibles por ti."
-        drag_to_add: "Arrástraos ao aspecto teu que coñecen"
-        no_requests: "Non tes peticións"
-        your_aspects: "Os teus aspectos"
-        your_inviter: "Aquí tes á xente que espera por ti:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Podes conectar ás túas redes sociais á túa conta en Diaspora. Poderás publicar a través da túa páxina de inicio cando selecciones facer público."
-        your_services: "Os teus servizos"
-      step_4: 
-        change_profile: "Podes editar o teu perfil e administrar os teus servizos conectados en calquera momento."
-        continue: "Continuar á páxina de inicio para ver todos os teus aspectos"
-        finish: "Finalizado"
-        manage_aspects: "Tamén podes engadir contactos mentres estás nunha páxina de aspecto."
-        ready_to_share: "Xa estás listo para comezar a compartir con"
-        set_up: "Todo listo, %{name}!"
-        user_menu: "o menú de usuario localizado arriba á dereita."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Benvido a Diaspora!"
     public: 
       does_not_exist: "O usuario %{username} non existe!"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 3bf48536fcf790453f4b0a53923a90d6a55eeea1..f9d1406fb6910b6cb5e1d27b142fc8e09ac152ff 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -118,6 +118,11 @@ he:
     one: "איש קשר אחד"
     other: "%{count} אנשי קשר"
     zero: "אין אנשי קשר"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "מחיקה"
   email: "דוא״ל"
   error_messages: 
@@ -420,6 +425,8 @@ he:
     reshare: 
       reshare: "שיתוף מחדש"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "אין הודעה להצגה."
     new_status_message: 
@@ -451,32 +458,19 @@ he:
       your_email: "כתובת הדוא״ל שלך"
       your_handle: "שם המשתמש שלך בדיאספורה"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "התחברות לשירותים הנוספים שלך"
-      define_aspects: "הגדרת ההיבטים שלך"
       edit_profile: "עריכת הפרופיל שלך"
       finished: "סיימת!"
       save_and_continue: "שמירה והמשך"
       signup_steps: "עליך להשלים את הליך ההרשמה על ידי ביצוע שלוש הפעולות הבאות:"
       skip: "דילוג על הסברי הפתיחה"
       step_2: 
-        add: "הוספה"
-        aspect_name: "שם ההיבט"
-        description: "כאן ניתן לספר לדיאספורה מהם ההיבטים השונים בהם אנשי הקשר שלך מסווגים. ניתן לנהל את אלו בשלב מאוחר יותר דרך תפריט החשבון בפינה השמאלית העליונה. ההיבטים שלך ייחודיים לך ואינם גלויים בפני אחרים."
-        drag_to_add: "יש לגרור אותם להיבט לו הם משויכים בעיניך"
-        no_requests: "אין לך בקשות"
-        your_aspects: "ההיבטים שלך"
-        your_inviter: "להלן רשימת האנשים הממתינים לך:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "באפשרותך להתחבר לרשתות החברתיות הקיימות שלך באמצעות חשבונך בדיאספורה. תהיה באפשרותך לפרסם באופן ציבורי דרך לשונית הבית שלך בעת בחירה ב\"הפיכה לציבורי\"."
-        your_services: "השירותים שלך"
-      step_4: 
-        change_profile: "באפשרותך לערוך את הפרופיל שלך ולנהל את השירותים המקושרים בכל זמן נתון"
-        continue: "המשך לעמוד הבית שלך לסקירה של כל ההיבטים שלך."
-        finish: "סיום"
-        manage_aspects: "ניתן להוסיף משתמשים גם כאשר נמצאים בכל אחד מעמודי ההיבטים."
-        ready_to_share: "כעת הסתיימו ההכנות לקראת השיתוף עם "
-        set_up: "הכול ערוך ומוכן, %{name}!"
-        user_menu: "בתפריט המשתמש שלך בפינה השמאלית העליונה."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "ברוך בואך לדיאספורה!"
     public: 
       does_not_exist: "המשתמש %{username} אינו קיים!"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index ad82249c657fca7f5e5e7a453c507d4685fb85df..2e7e2638263a8dfb359cf6ae039b8d079e3fe07b 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -118,6 +118,11 @@ hu:
     one: "1 ismerős"
     other: "%{count} ismerős"
     zero: "nincs ismerős"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%Y %B %d"
+      fullmonth_day: "%B %d"
   delete: "Törlés"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ hu:
     reshare: 
       reshare: "Újraosztás"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nincs üzenet."
     new_status_message: 
@@ -451,32 +458,19 @@ hu:
       your_email: "E-mail címed"
       your_handle: "Diaspora felhasználóneved"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Csatold a többi szolgáltatásod is ide"
-      define_aspects: "Csoport leírása"
       edit_profile: "Profil szerkesztése"
       finished: "Kész!"
       save_and_continue: "Mentés és folytatás"
       signup_steps: "Utolsó 3 lépés:"
       skip: "ugrás a kezdetekhez"
       step_2: 
-        add: "Hozzáadás"
-        aspect_name: "Csoport neve"
-        description: "Milyen csoportokba rendezed az ismerőseid? Később is megadhatod a jobb felső sarokban lévő Fiók menüben. A csoportjaid csak Te láthatod, mások nem."
-        drag_to_add: "Tedd bele őket a megfelelő csoportba"
-        no_requests: "Nincs felkérésed"
-        your_aspects: "Csoportjaid"
-        your_inviter: "Ezek az emberek várnak rád:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Csatlakoztathatod más közösségi hálózatodat is a Diaspora fiókodhoz. Lehetőséged van nyilvános üzenet írására is. Ehhez a Kezdőoldalon ki kell választanod a \"nyílvánossá tesz\" opciót."
-        your_services: "Szolgáltatásaid"
-      step_4: 
-        change_profile: "Bármikor módosíthatod a profilod, és kezelheted a kapcsolódó szolgáltatásokat."
-        continue: "A kezdőlapon láthatod a csoportjaid."
-        finish: "Befejezés"
-        manage_aspects: "Bármelyik csoportnál felvehetsz új ismerősöket."
-        ready_to_share: "Ezeket a csoportokat hoztad létre:"
-        set_up: "Készen is vagyunk, %{name}!"
-        user_menu: "a menü a bal felső sarokban van"
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Ãœdv a Diaspora*-n!"
     public: 
       does_not_exist: "%{username} nem létezik!"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 7f3ebd6c51872be5ca03cd1cdcb20c5f5361985b..8d3c21f618f0bc7c234b13d151a809cbc9ebe097 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -118,6 +118,11 @@ id:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ id:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Tidak ada pesan yang dapat ditampilkan."
     new_status_message: 
@@ -451,32 +458,19 @@ id:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "User %{username} does not exist!"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 3862bd753cf8119625c8400ec72f46c5904f6d38..b71102035e0fa37ed33cb7f78ae71096141dc45b 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -118,6 +118,11 @@ it:
     one: "1 contatto"
     other: "%{count} contatti"
     zero: "nessun contatto"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Cancella"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ it:
     reshare: 
       reshare: "Ricondividi"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nessun messaggio da visualizzare."
     new_status_message: 
@@ -451,32 +458,19 @@ it:
       your_email: "La tua email"
       your_handle: "Il tuo contatto Diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Collega i tuoi servizi"
-      define_aspects: "Definisci i tuoi aspetti"
       edit_profile: "Modifica il tuo profilo"
       finished: "Finito!"
       save_and_continue: "Salva e continua"
       signup_steps: "Completa la tua iscrizione facendo quanto segue:"
       skip: "salta l'introduzione"
       step_2: 
-        add: "Aggiungi"
-        aspect_name: "Nome aspetto"
-        description: "Specifica a Diaspora quali dei tuoi diversi aspetti sono visti da persone diverse. Potrai gestirli in un secondo momento attraverso il menu account in alto a destra. I tuoi aspetti sono visibili solo da te e non dagli altri."
-        drag_to_add: "Trascinale sull'aspetto di te che conoscono"
-        no_requests: "Non hai richieste"
-        your_aspects: "I tuoi aspetti"
-        your_inviter: "Queste sono le persone che ti stanno aspettando:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Puoi collegare altri social network a cui sei iscritto al tuo account Diaspora. Potrai postarci pubblicamente della tua Home page quando selezioni \"rendilo pubblico\""
-        your_services: "I tuoi servizi"
-      step_4: 
-        change_profile: "Puoi cambiare il tuo profilo in qualunque momento cliccando"
-        continue: "Vai alla tua Home page, una panoramica di tutti i tuoi aspetti."
-        finish: "Fine"
-        manage_aspects: "Puoi gestire i tuoi contatti in qualunque momento cliccando"
-        ready_to_share: "Adesso sei pronto per condividere con "
-        set_up: "Adesso hai tutto a posto, %{name}!"
-        user_menu: "nel tuo menu utente (in alto a destra)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Benvenuto su Diaspora!"
     public: 
       does_not_exist: "L'utente %{username} non esiste!"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 74c7facecbb20bb5cef5268bcb72b5b595e2f1eb..5761732cc4dc8f2fe32de60689f9832832016fd2 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -118,6 +118,11 @@ lt:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Å alinti"
   email: "El. paštas"
   error_messages: 
@@ -420,6 +425,8 @@ lt:
     reshare: 
       reshare: "Skelbti papildomai"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Žinučių nėra."
     new_status_message: 
@@ -451,32 +458,19 @@ lt:
       your_email: "Tavo el. pašto adresas"
       your_handle: "Tavo Diasporos vartotojo vardas"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Prijunk savo tinklus"
-      define_aspects: "Sukurk savo aspektus"
       edit_profile: "Užpildyk savo profilį"
       finished: "Baigta!"
       save_and_continue: "Išsaugoti ir tęsti"
       signup_steps: "Užbaik prisijungimą atlikdamas šiuos veiksmus:"
       skip: "praleisti pradinius žingsnius"
       step_2: 
-        add: "pridÄ—ti"
-        aspect_name: "Aspekto pavadinimas"
-        description: "Nurodyk Diasporai, kuriuos tavo aspektus matys kurie draugai. Tai galėsi keisti vėliau paspausdamas valdymo puslapį viršuje dešinėje. Tavo aspektai yra unikalūs tau, ir nematomi kitiems."
-        drag_to_add: "Pertempk juos į savo aspektą, kurį jie žino"
-        no_requests: "You have no requests"
-        your_aspects: "Tavo aspektai"
-        your_inviter: "Žmonės, kurie tavęs laukia:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Prijunk savo socialinius tinklus prie Diasporos paskyros. Tu galėsi viešai rašyti per savo \"visi\" puslapį, kai pasirinksi \"viešai\""
-        your_services: "Tavo tinklai"
-      step_4: 
-        change_profile: "Savo profilį keisti galėsi bet kada paspausdamas"
-        continue: "Tęsk pereidamas į savo puslapį \"visi\", visų tavo aspektų apžvalgą."
-        finish: "Užbaigti"
-        manage_aspects: "Savo aspektus valdyti galÄ—si bet kada paspausdamas"
-        ready_to_share: "Dabar esi pasiruošęs pradėti dalytis su "
-        set_up: "Viskas paruošta, %{name}!"
-        user_menu: "tavo vartotojo meniu (viršuje dešinėje)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Labas! Atvykai į Diasporą!"
     public: 
       does_not_exist: "Vartotojas %{username} neegzistuoja!"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 1394892bd83e4ce28ba76db7b3a19b738bd82593..f6f822b8bf2a55c865dcf787acf7bd7ba64676f8 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -118,6 +118,11 @@ mk:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Избриши"
   email: "Е-маил"
   error_messages: 
@@ -420,6 +425,8 @@ mk:
     reshare: 
       reshare: "Сподели повторно"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Нема пораки за прикажување."
     new_status_message: 
@@ -451,32 +458,19 @@ mk:
       your_email: "Вашиот е-маил"
       your_handle: "Вашето diaspora корисничко име"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Поврзи се со другите ваши сервиси"
-      define_aspects: "Дефинирајте ги вашите аспекти"
       edit_profile: "Уреди го вашиот профил"
       finished: "Заврши!"
       save_and_continue: "Зачувај и продолжи"
       signup_steps: "Завршете ја вашата регистрација со комплетирање на следниве три чекори:"
       skip: "прескокни ги почетните инструкции"
       step_2: 
-        add: "Додај"
-        aspect_name: "Име на аспект"
-        description: "Кажи и на Diaspora кои различни аспекти можат да бидат видени од различни контакти. Овие можат да бидат менаџирани преку подесувањата за корисничката сметка во горниот десен агол. Вашите аспекти се единствени и не можат да бидат видени од некој друг."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Ваши аспекти"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Можете да ги поврзете вашите постоечки социјални мрежи со вашата Diaspora корисничка сметка. Ќе можете да објавувате јавно преку вашата Домашна страница ако изберете \"направи јавен\""
-        your_services: "Вашите сервиси"
-      step_4: 
-        change_profile: "Можете да го уредите вашиот профил и да ги менаџирате поврзаните сервиси во секое време преку"
-        continue: "Продолжете кон вашата Домашна страница, преглед на сите ваши аспекти."
-        finish: "Заврши"
-        manage_aspects: "Можете да додадете контакти на било која страница на аспект."
-        ready_to_share: "Сега може да почнете со споделување со"
-        set_up: "Се е подесено, %{name}!"
-        user_menu: "корисничкото мени лоцирано во горниот десен агол."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Добредојдe на Diaspora!"
     public: 
       does_not_exist: "Корисникот %{username} не постои!"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index ff7ebb8fbc2f2ae940fb1157b5a465e1ae822b37..26532e97913e733dbfc26b4f04196b6cc0010956 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -118,6 +118,11 @@ nb:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Delete"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ nb:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Ingen melding å vise."
     new_status_message: 
@@ -451,32 +458,19 @@ nb:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
       edit_profile: "Edit your profile"
       finished: "Finished!"
       save_and_continue: "Save and continue"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welcome to Diaspora!"
     public: 
       does_not_exist: "User %{username} does not exist!"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 327ddfab688f28380ea462abab87a78348b352cf..ad0cc3d95d77545724a5d20ed03717b1ff30363f 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -118,6 +118,11 @@ nl:
     one: "1 contact"
     other: "%{count} contacten"
     zero: "geen contacten"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %J"
+      fullmonth_day: "%B %d"
   delete: "Verwijderen"
   email: "E-mail"
   error_messages: 
@@ -165,7 +170,7 @@ nl:
       have_a_problem: "Probleem? Vind hier een antwoord"
       logged_in_as: "ingelogd als %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      toggle: "toggle mobile site"
+      toggle: "switch mobiele versie"
       whats_new: "wat is nieuw op Diaspora?"
       your_aspects: "jou aspecten"
     header: 
@@ -420,6 +425,8 @@ nl:
     reshare: 
       reshare: "Herdeel"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Geen bericht om te weergeven."
     new_status_message: 
@@ -451,32 +458,19 @@ nl:
       your_email: "Jouw e-mail"
       your_handle: "Jouw Diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Verbind met je andere services"
-      define_aspects: "Definieer je aspecten"
       edit_profile: "Bewerk je profiel"
       finished: "Klaar!"
       save_and_continue: "Sla op en ga verder"
       signup_steps: "Voltooi je aanmelding door middel van de volgende drie stappen:"
       skip: "sla 'getting started' over"
       step_2: 
-        add: "Voeg toe"
-        aspect_name: "Aspect naam"
-        description: "Laat Diaspora weten welke verschillende aspecten verschillende mensen van jou zien. Je kunt deze later veranderen door middel van je accountmenu rechtsboven. Aspecten zijn uniek voor jou en niet zichtbaar voor anderen."
-        drag_to_add: "Sleep ze naar het aspect dat zij van jou kennen"
-        no_requests: "Je hebt geen verzoeken"
-        your_aspects: "Jouw aspecten"
-        your_inviter: "Dit zijn de mensen die op jou wachten:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Je kunt je bestaande sociale netwerken verbinden met je Diaspora account. Je kan via je Home pagina openbare berichten plaatsen door 'maak openbaar' aan te vinken."
-        your_services: "Jouw services"
-      step_4: 
-        change_profile: "Je kunt ieder moment je profiel bewerken en je verbonden services beheren door te klikken op"
-        continue: "Ga door naar je Home pagina, een overzicht van al je aspecten."
-        finish: "Voltooi"
-        manage_aspects: "Je kunt ook contacten toevoegen vanaf iedere willekeurige aspect pagina."
-        ready_to_share: "Je bent nu klaar om te beginnen met delen met "
-        set_up: "Je bent er helemaal klaar voor, %{name}!"
-        user_menu: "het gebruikersmenu rechtsboven."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Welkom op Diaspora!"
     public: 
       does_not_exist: "Gebruiker %{username} bestaat niet!"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index da3190e0cf182231a7f44ba51390d5069da77f45..88bc60845aec9733477aec6cb9b333a68a79b323 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -118,6 +118,11 @@ pl:
     one: "1 kontakt"
     other: "%{count} kontaktów"
     zero: "brak kontaktów"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Skasuj"
   email: "E-mail"
   error_messages: 
@@ -420,6 +425,8 @@ pl:
     reshare: 
       reshare: "Podziel siÄ™ ponownie"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Brak wiadomości."
     new_status_message: 
@@ -451,32 +458,19 @@ pl:
       your_email: "Twój e-mail"
       your_handle: "Twój identyfikator w Diasporze"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Połącz się ze swoimi usługami"
-      define_aspects: "Zdefiniuj swoje aspekty"
       edit_profile: "Edytuj swój profil"
       finished: "Gotowe!"
       save_and_continue: "Zapisz i kontynuuj"
       signup_steps: "Dokończ rejestrację w trzech krokach:"
       skip: "pomiń wprowadzenie"
       step_2: 
-        add: "Dodaj"
-        aspect_name: "Nazwa aspektu"
-        description: "Powiedz Diasporze, które aspekty Twojego życia mają być widoczne dla wybranych znajomych. Możesz później zarządzać tym ustawieniem klikając zakładkę zarządzania umieszczoną w prawym górnym rogu. Twoje aspekty są widoczne wyłącznie dla Ciebie."
-        drag_to_add: "Przeciągnij ich do właściwych aspektów Twojego życia"
-        no_requests: "Nie masz żadnych zaproszeń"
-        your_aspects: "Twoje aspekty"
-        your_inviter: "Oto lista osób, które na Ciebie czekają:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Połącz używane sieci społecznościowe z Diasporą.  Będziesz w stanie publikować wpisy w zakładce Wszyscy, gdy wybierzesz \"upublicznij\"."
-        your_services: "Twoje usługi"
-      step_4: 
-        change_profile: "W każdej chwili możesz zmienić informacje profilowe i zarządzać powiązanymi usługami korzystając"
-        continue: "Kontunuuj na stronie Wszyscy, która zawiera przegląd aspektów."
-        finish: "Zakończ"
-        manage_aspects: "Możesz również dodawać kontakty będąc na stronie dowolnego aspektu."
-        ready_to_share: "Możesz teraz zacząć dzielić się z"
-        set_up: "Wszystko gotowe, %{name}!"
-        user_menu: "z Twojego menu użytkownika (prawy górny róg)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Witaj w Diasporze!"
     public: 
       does_not_exist: "Użytkownik %{username} nie istnieje!"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 8819a9a47fba2cc648b7c0b3a0f5ca8e1db0caeb..43d7e216f15456fc32294c857a55e05bbb7dc334 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -118,6 +118,11 @@ pt-BR:
     one: "1 contato"
     other: "%{count} contatos"
     zero: "0 contatos"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Apagar"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ pt-BR:
     reshare: 
       reshare: "Compartilhar novamente"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Sem mensagens para mostrar."
     new_status_message: 
@@ -451,32 +458,19 @@ pt-BR:
       your_email: "Seu email"
       your_handle: "Seu endereço diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Conecte seus outros serviços"
-      define_aspects: "Defina seus aspectos"
       edit_profile: "Editar seu perfil"
       finished: "Feito!"
       save_and_continue: "Salvar e continuar"
       signup_steps: "Termine o seu cadastro completando esses três passos:"
       skip: "pular a iniciação"
       step_2: 
-        add: "Adicionar"
-        aspect_name: "Nome do aspecto"
-        description: "Diga à Diaspora quais aspectos seus são conhecidos por outros contatos. Você pode mudar isso depois no menu da sua conta, no topo à direita. Seus aspectos são conhecidos apenas por você e não são visíveis por outras pessoas."
-        drag_to_add: "Arraste-os para seu aspecto que eles conhecem"
-        no_requests: "Você não possui solicitações"
-        your_aspects: "Seus aspectos"
-        your_inviter: "Eis as pessoas que estão esperando por você:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Você pode conectar suas redes sociais existentes à sua conta do Diaspora. Você poderá postar publicamente na sua página principal quando selecionar \"tornar público\""
-        your_services: "Seus serviços"
-      step_4: 
-        change_profile: "Você pode editar seu perfil e alterar seus serviços conectados a qualquer momento "
-        continue: "Vá para sua página principal, uma visão geral de todos os seus aspectos."
-        finish: "Terminar"
-        manage_aspects: "Você também pode adicionar contatos em qualquer página de aspecto."
-        ready_to_share: "Você está pronto para compartilhar com "
-        set_up: "Você está pronto, %{name}!"
-        user_menu: "o menu do usuário fica no topo, à direita."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Bem-vindo à Diaspora!"
     public: 
       does_not_exist: "O usuário %{username} não existe!"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index b8c4ce6d4cf611b1b43c08e1789e5126f9800ac9..1b2df214ed717b25cbcc4add62d53f9d6ac2ff44 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -118,6 +118,11 @@ pt-PT:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Apagar"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ pt-PT:
     reshare: 
       reshare: "Partilhar Novamente"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nenhuma mensagem para mostrar."
     new_status_message: 
@@ -451,32 +458,19 @@ pt-PT:
       your_email: "O teu email"
       your_handle: "O teu nome de utilizador no Diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Liga os teus outros serviços"
-      define_aspects: "Define os teus grupos"
       edit_profile: "Edita o teu perfil"
       finished: "Terminado!"
       save_and_continue: "Guardar e continuar"
       signup_steps: "Termina o teu registo completando estes três passos:"
       skip: "saltar a introdução"
       step_2: 
-        add: "Adicionar"
-        aspect_name: "Nome do grupo"
-        description: "Indica ao Diaspora que diferentes grupos teus são vistos por diferentes contactos. Podes geri-los mais tarde clicando no separador de gestão no canto superior direito. Os teus grupos são únicos, e não são visíveis por outros."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Os teus grupos"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "É possível ligares as tuas outras redes sociais à tua conta no Diaspora*. Poderás tornas as tuas mensagens públicas a partir da tua página principal quando escolheres \"tornar público\""
-        your_services: "Os teus serviços"
-      step_4: 
-        change_profile: "Podes editar o teu perfil e gerir os teus serviços conectados em qualquer altura através de"
-        continue: "Continuar para a tua página Inicial, uma vista global de todos os teus grupos."
-        finish: "Terminar"
-        manage_aspects: "Também podes adicionar contactos quando estiveres na página de um grupo"
-        ready_to_share: "Estás agora pronto para começar a partilhar com"
-        set_up: "Estás pronto, %{name}!"
-        user_menu: "no teu menu de utilizador (canto superior direito)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Bem-vindo(a) ao Diaspora!"
     public: 
       does_not_exist: "O utilizador %{username} não existe!"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 9789c3aabc689a11b5b4ea2f0f02604c04b963ae..9119006cd989c468c78457141142da660d7b48e3 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -118,6 +118,11 @@ ro:
     one: "1 contact"
     other: "%{count} contacte"
     zero: "nici un contact"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Åžterge"
   email: "E-mail"
   error_messages: 
@@ -420,6 +425,8 @@ ro:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Nici un mesaj nou."
     new_status_message: 
@@ -451,32 +458,19 @@ ro:
       your_email: "E-mailul tău"
       your_handle: "Identificatorul tau pe Diaspora"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
       edit_profile: "Editează-ţi profilul"
       finished: "Finished!"
       save_and_continue: "Salvează si continuă"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "sări peste tutorial"
       step_2: 
-        add: "Adaugă"
-        aspect_name: "Numele aspectului"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "Nu ai nici o cerere"
-        your_aspects: "Aspectele dvs."
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Serviciile dvs."
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
-        finish: "Termină"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Bine ai venit pe Diaspora!"
     public: 
       does_not_exist: "Utilizatorul %{username} nu există!"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 66d1e40f3efede320e06f65261034ceb7b9eaa7c..475937d3d7f6fd0b24594d9945e48cc997c11ba9 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -118,6 +118,11 @@ ru:
     one: "1 контакт"
     other: "%{count} контактов"
     zero: "ни одного контакта"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Удаление"
   email: "Email"
   error_messages: 
@@ -420,6 +425,8 @@ ru:
     reshare: 
       reshare: "Поделиться повторно"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Новых сообщений нет."
     new_status_message: 
@@ -451,32 +458,19 @@ ru:
       your_email: "Ваш адрес электронной почты"
       your_handle: "Ваше управление Диаспорой"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Соедениться с сервисами"
-      define_aspects: "Определиться с аспектами"
       edit_profile: "Отредактировать профиль"
       finished: "Готово!"
       save_and_continue: "Сохранить и продолжить"
       signup_steps: "Для заверщения вашей регистрации, выполните:"
       skip: "пропускать при старте"
       step_2: 
-        add: "Добавить"
-        aspect_name: "Имя аспекта"
-        description: "Укажите какие аспекты будут доступны для просмотра вашим контактам. Вы сможете изменять их в будущем, нажав на вкладку Управление в правом верхнем углу. Ваши аспекты уникальны и не видны другим."
-        drag_to_add: "Перетащите их в ваш аспект"
-        no_requests: "У вас нет запросов"
-        your_aspects: "Ваши аспекты"
-        your_inviter: "Здесь люди ожидающие вас:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Подключите аккаунты с других социальных сетей к вашей Диаспоре. Вы сможете общедоступно размещать через вкладку \"Домашний\""
-        your_services: "Ваши сервисы"
-      step_4: 
-        change_profile: "Вы можете редактировать свой профиль и управлять подключенными услугами в любое время"
-        continue: "Продолжить на вашей странице, обзор всех ваших аспектов."
-        finish: "Завершить"
-        manage_aspects: "Так же вы можете добавлять контакты на любой странице аспектов."
-        ready_to_share: "Теперь вы готовы начать обмен с"
-        set_up: "Вы все готовы, %{name}!"
-        user_menu: "пользовательское меню, расположено в правом верхнем углу."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Добро пожаловать в Диаспору!"
     public: 
       does_not_exist: "Пользователя %{username} не существует!"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index e2b6a08847b0199e236a1be65b9a502662ad1bdd..b924af364fdbb01e36f62fca979e1938a1231260 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -118,6 +118,11 @@ sk:
     one: "1 kontakt"
     other: "kontakty (%{count})"
     zero: "žiadne kontakty"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Zmazať"
   email: "e-mail"
   error_messages: 
@@ -247,9 +252,9 @@ sk:
       people_on_pod_are_aware_of: "Ľudia na pode sú si vedomí"
       results_for: "Výsledky hľadania %{params}"
     index: 
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      couldnt_find_them_send_invite: "Nepodarilo sa nájsť? Pošlite pozvánku!"
       no_one_found: "...a nenašlo sa."
-      no_results: "Hey! You need to search for something."
+      no_results: "Hej! Môžete sa po tom poobzerať."
       results_for: "Výsledky vyhľadávania pre"
     person: 
       add_contact: "Pridať kontakt"
@@ -420,6 +425,8 @@ sk:
     reshare: 
       reshare: "Znovu zdieľať"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Žiadne správy k zobrazeniu."
     new_status_message: 
@@ -451,32 +458,19 @@ sk:
       your_email: "Váš e-mail"
       your_handle: "Príručka k Diaspore"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Pripojiť Vaše služby"
-      define_aspects: "Definujte Váš aspekt"
       edit_profile: "Upraviť Váš profil"
       finished: "Dokončené!"
       save_and_continue: "Uložiť a pokračovať"
       signup_steps: "Dokončite svoju registráciu týmito troma krokmi:"
       skip: "Preskočiť"
       step_2: 
-        add: "Pridať"
-        aspect_name: "Názov aspektu"
-        description: "Prezraďte Diaspore, kto môže vidieť Vaše aspekty. Neskôr ich môžete spravovať kliknutím na tlačidlo - nastavenia účtu, vpravo hore."
-        drag_to_add: "Potiahniťe ich do aspektov, ktoré poznajú"
-        no_requests: "Nemáte žiadne žiadosti."
-        your_aspects: "Váš aspekt"
-        your_inviter: "Toto sú ľudia, ktorí na Vás čakajú:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Diasporu môžete prepojiť s Vašimi sociálnymi sieťami v nastaveniach. Vaše statusy uverejníte mimo Diaspory vybratím možnosti \"zverejniť\"."
-        your_services: "Vaše služby"
-      step_4: 
-        change_profile: "Váš profil, ako aj iné nastavenia môžete kedykoľvek upraviť."
-        continue: "Pokračujte na domácu stránku, ktorá poskytuje prehľad zo všetkých Vašich aspektov."
-        finish: "Dokončiť"
-        manage_aspects: "Spravovať aspekty môžete kedykoľvek kliknutím na ne."
-        ready_to_share: "Teraz už môžte zdieľať s"
-        set_up: "Gratulujeme %{name}, všetko ste úspešne nastavili!"
-        user_menu: "užívateľské menu je situované vpravo hore."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Vitajte v Diaspore!"
     public: 
       does_not_exist: "Užívateľ %{username} neexistuje!"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 9b8bb62e0ffdbc535f2fced8591bdc96b8233b5a..55acf523cbb160db3de6443a75e16b55d431d530 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -118,6 +118,11 @@ sl:
     one: "1 stik"
     other: "Å¡tevilo stikov %{count}"
     zero: "brez stikov"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Izbriši"
   email: "E-pošta"
   error_messages: 
@@ -420,6 +425,8 @@ sl:
     reshare: 
       reshare: "Deli znova"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Ni sporočil."
     new_status_message: 
@@ -451,32 +458,19 @@ sl:
       your_email: "Vaš e-naslov"
       your_handle: "Vaš diaspora naslov"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Povežite se s servisi"
-      define_aspects: "Določite vaše skupine"
       edit_profile: "Uredite vaš profil"
       finished: "Končano!"
       save_and_continue: "Shrani in nadaljuj"
       signup_steps: "Zaključite vašo registracijo s pomočjo naslednjih treh korakov:"
       skip: "preskoči čarovnika"
       step_2: 
-        add: "Dodaj"
-        aspect_name: "Naziv skupine"
-        description: "Navedite Diaspori katere skupine želite uporabljati za posamezne stike. Skupine lahko kasneje uredite preko menija desno zgoraj. Vaše skupine so unikatne in niso vidne ostalim osebam."
-        drag_to_add: "Povlecite jih v eno od vaših skupin"
-        no_requests: "Nimate novih prošenj"
-        your_aspects: "Vaše skupine"
-        your_inviter: "Naslednje osebe vas čakajo:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Vaš Diaspora uporabniški račun lahko povežete z že obstoječimi socialnimi omrežji. Prav tako lahko vaše objave prispevkov skozi domačo stran objavite javno, če izberete možnost \"objavi kot javno\""
-        your_services: "Vaši servisi"
-      step_4: 
-        change_profile: "Vaš profil in povezave na servise lahko uredite kadarkoli skozi "
-        continue: "Nadaljujte na domačo stran, kjer je pregled vseh vaših skupin."
-        finish: "Zaključi"
-        manage_aspects: "Stike lahko dodajate tudi na katerekoli strani od vaših skupin."
-        ready_to_share: "Lahko pričnete deliti s skupino "
-        set_up: "Odlično, zdaj ste pripravljeni %{name}!"
-        user_menu: "uporabniškega menija na desni zgornji strani."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Dobrodošli v Diasporo!"
     public: 
       does_not_exist: "Uporabnik %{username} ne obstaja!"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index e89888996a07fe38bde2b31ab2b19b0c27831c47..88b8bbb70502f4c27bca223e4dcb7046e6cc7271 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -118,6 +118,11 @@ sv:
     one: "1 kontakt"
     other: "%{count} kontakter"
     zero: "inga kontakter"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Ta bort"
   email: "E-post"
   error_messages: 
@@ -186,7 +191,7 @@ sv:
   next: "nästa"
   no_new_notifications: "inga nya notifieringar"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "kommenterade även din kontakts"
     comment_on_post: "kommenterade din"
     deleted: "borttaget"
     index: 
@@ -201,7 +206,7 @@ sv:
       sign_in: "Sign in to view it."
       subject: "%{name} has also commented."
     comment_on_post: 
-      commented: "has commented on your post!"
+      commented: "Har kommenterat ditt inlägg"
       sign_in: "Sign in to view it."
       subject: "%{name} has commented on your post."
     diaspora: "Diasporas mailrobot"
@@ -209,7 +214,7 @@ sv:
     love: "hälsningar,"
     new_request: 
       just_sent_you: "skickade nyss en kontaktförfrågan till dig på Diaspora"
-      sign_in: "logga in här"
+      sign_in: "Logga in här"
       subject: "ny kontaktförfrågan från %{from}"
       try_it_out: "Du borde verkligen överväga att kolla upp detta."
     request_accepted: 
@@ -270,7 +275,7 @@ sv:
       share_with: "Börja dela med %{name}"
     show: 
       does_not_exist: "Den här personen finns inte!"
-      incoming_request: "Du har en inkommande förfrågan från den här personen."
+      incoming_request: "%{name} vill dela med dig"
       no_posts: "inga meddelanden att visa!"
       not_connected: "Du är inte ansluten till %{name}"
       recent_posts: "Postat nyligen"
@@ -415,11 +420,13 @@ sv:
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
       share: "Dela"
-      share_with: "Dela med %{aspect}"
+      share_with: "dela med"
       whats_on_your_mind: "what's on your mind?"
     reshare: 
       reshare: "Ã…terdela"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Inget meddelande att visa."
     new_status_message: 
@@ -451,32 +458,19 @@ sv:
       your_email: "Din epost"
       your_handle: "Ditt Diaspora-användarnamn"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Anslut till andra tjänster"
-      define_aspects: "Välj dina sidor"
       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: 
-        add: "Lägg till"
-        aspect_name: "Namn på sida"
-        description: "Här anger du vilka sidor av dig själv du vill visa på Diaspora. Lägger du till en person på en viss sida kan denne bara se information som du publicerar på just den sidan. Vill du ändra dessa senare så kan du göra det under fliken \"Hantera\"."
-        drag_to_add: "Drag och släpp, för att visa dem rätt sida av dig själv"
-        no_requests: "Du har inga förfrågningar"
-        your_aspects: "Dina sidor"
-        your_inviter: "Här är de personer som väntar på dig:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Anslut dina befintliga tjänster till ditt Diaspora-konto.  Du kommer att kunna skicka meddelanden genom dessa om du väljer \"gör publik.\" på sidan för alla kontakter."
-        your_services: "Dina tjänster"
-      step_4: 
-        change_profile: "Du kan ändra din profil och dina anslutna tjänster närsomhelst genom att klicka på"
-        continue: "Fortsätt till Hem, en överblick av alla dina sidor."
-        finish: "Slutför"
-        manage_aspects: "Du kan lägga till kontakter direkt från valfri sida."
-        ready_to_share: "Du är nu redo att börja dela med "
-        set_up: "Nu är guiden klar, %{name}!"
-        user_menu: "i användarmenyn som finns uppe till vänster."
+        finish: "Finish"
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Välkommen till diaspora!"
     public: 
       does_not_exist: "Användaren %{username} finns inte!"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index b91b2d774cce3ddc10f00cf36d06ce97d1edb561..5f8dd06b7284412e40df5fcb530de367069f745b 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -118,6 +118,11 @@ tr:
     one: "1 contact"
     other: "%{count} contacts"
     zero: "no contacts"
+  date: 
+    formats: 
+      birthday: "%B %d"
+      birthday_with_year: "%B %d %Y"
+      fullmonth_day: "%B %d"
   delete: "Sil"
   email: "E-Posta"
   error_messages: 
@@ -420,6 +425,8 @@ tr:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    destroy: 
+      failure: "Failed to delete post"
     helper: 
       no_message_to_display: "Gosterilcek bir mesaj yok."
     new_status_message: 
@@ -451,32 +458,19 @@ tr:
       your_email: "Your email"
       your_handle: "Your diaspora handle"
     getting_started: 
+      connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Servislerine baÄŸlan"
-      define_aspects: "Define your aspects"
       edit_profile: "Profilini düzenle"
       finished: "Finished!"
       save_and_continue: "Kaydet ve devam et"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        skip: "Skip"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Servisleriniz"
-      step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
         finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "Artık paylaşıma hazırsınız, "
-        set_up: "Kurulum tamamlandı, %{name}!"
-        user_menu: "kullanıcı mönünüzde (üstte sağda)."
+        people_already_on_diaspora: "People already on Diaspora"
       welcome: "Diaspora'ya hoÅŸgeldin!"
     public: 
       does_not_exist: "%{username} kullanıcısı bulunmamaktadır!"
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index da8ce856a5eeb7a9da7ac97788e5eee61e745c1e..9e9421c228d6ef35c85290e0c41234f7bcb99997 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -7,6 +7,9 @@ cs:
   javascripts: 
     confirm_dialog: "Jste si jisti?"
     search_for: "Hledat {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "1 dnem"
       days: "%d dny"
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index d15df7bcf5479328d02b401457d8ee531fb49c0b..809b47e4a584c69cf615a8777afab1c3354012e0 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -7,6 +7,9 @@ da:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "en dag"
       days: "%d dage"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index bfc58e60e3511ed8a1fe61fd8c6e33c984ff80e3..8d4371151bc10e45d1a78175321741176cf02a97 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -7,6 +7,9 @@ de:
   javascripts: 
     confirm_dialog: "Bist du sicher?"
     search_for: "Suche nach {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "etwa einem Tag"
       days: "%d Tagen"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 2055a84b7b871955c017af09922e342db6d1e66c..88930cbeeff4979e462cee35b2e74bc507e419f6 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -7,6 +7,9 @@ el:
   javascripts: 
     confirm_dialog: "Είστε σίγουρος/η;"
     search_for: "Αναζήτηση για {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "μία μέρα"
       days: "%d μέρες"
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 5180149a069a4b32b7d0c1816b30370ca1e1b1bb..337fdef20d1b1909c0de47e56516c87d3d849112 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -7,6 +7,9 @@ en_shaw:
   javascripts: 
     confirm_dialog: "𐑸 𐑿 𐑖𐑻?"
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "𐑩 𐑛𐑱"
       days: "%d 𐑛𐑱𐑟"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 867306be9805203f9d1f42e7474a2a07c591d377..703d96eac4d6fa93e61685853ce5b7938b6fc6d1 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -7,6 +7,9 @@ es:
   javascripts: 
     confirm_dialog: "¿Estás seguro?"
     search_for: "Buscar a {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "un día"
       days: "%d días"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index 223b2980af5483d49a5427dc5047fdffe0268a8f..9a4fcdd5d5f576043f67631c499019a8c4e2013f 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -6,7 +6,10 @@
 fi: 
   javascripts: 
     confirm_dialog: "Oletko varma?"
-    search_for: "Search for {{name}}"
+    search_for: "Etsi nimellä {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Et voi poistaa henkilöä viimeisestä näkymästä. (Jos halauat katkaista yhteytesi tähän henkilöön, sinun täytyy poistaa kontakti.)"
     timeago: 
       day: "päivä"
       days: "%d päivää"
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index e5bb03f7dde22085b1d041ebdaddfe6096b04fb4..8a61853de1f2112f38969dd798de777f982248c1 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -7,6 +7,9 @@ fr:
   javascripts: 
     confirm_dialog: "Êtes-vous sûr ?"
     search_for: "Chercher {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "environ un jour"
       days: "environ %d jours"
diff --git a/config/locales/javascript/javascript.he.yml b/config/locales/javascript/javascript.he.yml
index 0f0eac3cb965ee8f99cbdd18d23b7286e0d20638..2640c43cea8b52feaeeca57ebd6cf9406b611af1 100644
--- a/config/locales/javascript/javascript.he.yml
+++ b/config/locales/javascript/javascript.he.yml
@@ -7,6 +7,9 @@ he:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "יום"
       days: "%d ימים"
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index 65addafc193fa1d0888aa3604e803b86f3d84e3b..d4cc20196931d9f46421fef333a5ac03436d099f 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -7,6 +7,9 @@ hu:
   javascripts: 
     confirm_dialog: "Biztos vagy benne?"
     search_for: "{{name}} keresése."
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "egy napja"
       days: "%d napja"
diff --git a/config/locales/javascript/javascript.id.yml b/config/locales/javascript/javascript.id.yml
index 8f8bbe8e2eae95357c97943ab8492e67fc44a0c5..df6716b8883ab591a279f38af632503b57bc6c7d 100644
--- a/config/locales/javascript/javascript.id.yml
+++ b/config/locales/javascript/javascript.id.yml
@@ -7,6 +7,9 @@ id:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "sehari"
       days: "%d hari"
diff --git a/config/locales/javascript/javascript.it.yml b/config/locales/javascript/javascript.it.yml
index 5eb1df245079940e1c3d424e18fb452671ee5f21..4c9068f982dbf56fcc5c9b8e01046ed05ab8b889 100644
--- a/config/locales/javascript/javascript.it.yml
+++ b/config/locales/javascript/javascript.it.yml
@@ -7,6 +7,9 @@ it:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "un giorno"
       days: "%d giorni"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 11239d26c2a7ff78e66f2b136999cee7b39da31a..9525b070e13ca0f3dd41fdfb91788a880c0d06e5 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -7,6 +7,9 @@ nl:
   javascripts: 
     confirm_dialog: "Weet je het zeker?"
     search_for: "Zoek naar {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "een dag"
       days: "%d dagen"
diff --git a/config/locales/javascript/javascript.pt-BR.yml b/config/locales/javascript/javascript.pt-BR.yml
index acb0cdf41ceb75a3a6836efe141d0329e1568501..ff5f48949ece6f4d88f7310a11b7b393b95e0d22 100644
--- a/config/locales/javascript/javascript.pt-BR.yml
+++ b/config/locales/javascript/javascript.pt-BR.yml
@@ -7,6 +7,9 @@ pt-BR:
   javascripts: 
     confirm_dialog: "Tem certeza?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "um dia"
       days: "%d dias"
diff --git a/config/locales/javascript/javascript.pt-PT.yml b/config/locales/javascript/javascript.pt-PT.yml
index f1665926f6b46198877f08bad5306f3725bd57b1..149bd4e44d88101ebf31f036908afca7f75cb628 100644
--- a/config/locales/javascript/javascript.pt-PT.yml
+++ b/config/locales/javascript/javascript.pt-PT.yml
@@ -7,6 +7,9 @@ pt-PT:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "um dia"
       days: "%d dias"
diff --git a/config/locales/javascript/javascript.ro.yml b/config/locales/javascript/javascript.ro.yml
index aee694dde963d879153fd43ae4e0701105daa565..b0356430a4dda278fa3082838f4a24de3ab552eb 100644
--- a/config/locales/javascript/javascript.ro.yml
+++ b/config/locales/javascript/javascript.ro.yml
@@ -7,6 +7,9 @@ ro:
   javascripts: 
     confirm_dialog: "EÅŸti sigur?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "o zi"
       days: "%d zile"
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index 6f878b199e954a7b1f4b38e1f1fb60e00b8e1abd..1aaab3057c4f19b3302c9b1feda8cbf6d2225b59 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -7,6 +7,9 @@ ru:
   javascripts: 
     confirm_dialog: "Вы уверенны? "
     search_for: "Искать для {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "день"
       days: "%d дней"
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b0669e9f43a76988a1ee40d9baf1f18ca244c279
--- /dev/null
+++ b/config/locales/javascript/javascript.sk.yml
@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+sk: 
+  javascripts: 
+    confirm_dialog: "Ste si istý?"
+    search_for: "Hľadať {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    timeago: 
+      day: "včera"
+      days: "%d dni"
+      hour: "hodinou"
+      hours: "%d hodinami"
+      minute: "minútou"
+      minutes: "%d minútami"
+      month: "mesiacom"
+      months: "%d mesiacmi"
+      prefixAgo: "pred"
+      prefixFromNow: ""
+      seconds: "menej než minúta"
+      suffixAgo: ""
+      suffixFromNow: ""
+      year: "rokom"
+      years: "%d roky"
+    videos: 
+      unknown: "Neznámy typ videa"
+      watch: "Pozrite sa na toto video na {{provider}}"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index bf3dcab1f84a5aed966b37ec0df82f0fffab9f3a..e1d36e803dbfac4e934e44af6b9bd8cad19f4ab6 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -7,6 +7,9 @@ sv:
   javascripts: 
     confirm_dialog: "Are you sure?"
     search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     timeago: 
       day: "en dag"
       days: "%d dagar"
diff --git a/config/locales/rails-i18n/sv-SE.yml b/config/locales/rails-i18n/sv-SE.yml
index bddbfc83dbe8d0277b1355ccc10ba4e2d1dd638a..2164a84520aa906d8b084005c70a72bf8a5c2e33 100644
--- a/config/locales/rails-i18n/sv-SE.yml
+++ b/config/locales/rails-i18n/sv-SE.yml
@@ -15,6 +15,9 @@
       delimiter: " "
       # Number of decimals after the separator (the number 1 with a precision of 2 gives: 1.00)
       precision: 2
+      significant: false
+      strip_insignificant_zeros: false
+      
 
     # Used in number_to_currency()
     currency:
@@ -22,14 +25,31 @@
         # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
         format: "%n %u"
         unit: "kr"
+        separator: ","
+        delimiter: " "
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+        
+    percentage:
+      format:
+         delimiter: ""
+
+    precision:
+      format:
+        delimiter: ""
+
 
     # Used in number_to_human_size()
     human:
       format:
         # These three are to override number.format and are optional
         # separator:
-        # delimiter: ""
+        delimiter: ""
         precision: 1
+        significant: false
+        strip_insignificant_zeros: false
+        
       storage_units:
         # Storage units output formatting.
         # %u is the storage unit, %n is the number (default: 2 MB)
@@ -42,6 +62,16 @@
           mb: "MB"
           gb: "GB"
           tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: "Tusen"
+          million: "Miljon"
+          billion: "Miljard"
+          trillion: "Biljon"
+          quadrillion: "Biljard"
+
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -88,49 +118,63 @@
       minute: "Minut"
       second: "Sekund"
 
-  activemodel:
-    errors:
-      template:
-        header:
-          one:   "Ett fel förhindrade denna %{model} från att sparas"
-          other: "%{count} fel förhindrade denna %{model} från att sparas"
-        # The variable :count is also available
-        body: "Det var problem med följande fält:"
+
+  helpers:
+    select:
+      prompt: "Välj"
+
+    submit:
+      create: 'Skapa %{model}'
+      update: 'Ändra %{model}'
+      submit: 'Spara %{model}'
+
+  errors:
+    format: "%{attribute} %{message}"
+
+    messages: &errors_messages
+      inclusion: "finns inte i listan"
+      exclusion: "är reserverat"
+      invalid: "är ogiltigt"
+      confirmation: "stämmer inte överens"
+      accepted: "måste vara accepterad"
+      empty: "får ej vara tom"
+      blank: "måste anges"
+      too_long: "är för lång (maximum är %{count} tecken)"
+      too_short: "är för kort (minimum är %{count} tecken)"
+      wrong_length: "har fel längd (ska vara %{count} tecken)"
+      taken: "har redan tagits"
+      not_a_number: "är inte ett nummer"
+      not_an_integer: "måste vara ett heltal"
+      greater_than: "måste vara större än %{count}"
+      greater_than_or_equal_to: "måste vara större än eller lika med %{count}"
+      equal_to: "måste vara samma som"
+      less_than: "måste vara mindre än %{count}"
+      less_than_or_equal_to: "måste vara mindre än eller lika med %{count}"
+      odd: "måste vara udda"
+      even: "måste vara jämnt"
+      record_invalid: "Ett fel uppstod: %{errors}"
+
 
   activerecord:
     errors:
       # model.errors.full_messages format.
-      format: "%{attribute} %{message}"
-      
       template:
         header:
           one:    "Ett fel förhindrade denna %{model} från att sparas"
           other:  "%{count} fel förhindrade denna %{model} från att sparas"
         body: "Det var problem med följande fält:"
+
+      messages:
+        taken: "has already been taken"
+        record_invalid: "Validation failed: %{errors}"
+        <<: *errors_messages
+
+      full_messages:
+        format: "%{attribute} %{message}"
+
       
       # The values :model, :attribute and :value are always available for interpolation
       # The value :count is available when applicable. Can be used for pluralization.
-      messages:
-        inclusion: "finns inte i listan"
-        exclusion: "är reserverat"
-        invalid: "är ogiltigt"
-        confirmation: "stämmer inte överens"
-        accepted: "måste vara accepterad"
-        empty: "får ej vara tom"
-        blank: "måste anges"
-        too_long: "är för lång (maximum är %{count} tecken)"
-        too_short: "är för kort (minimum är %{count} tecken)"
-        wrong_length: "har fel längd (ska vara %{count} tecken)"
-        taken: "har redan tagits"
-        not_a_number: "är inte ett nummer"
-        greater_than: "måste vara större än %{count}"
-        greater_than_or_equal_to: "måste vara större än eller lika med %{count}"
-        equal_to: "måste vara samma som"
-        less_than: "måste vara mindre än %{count}"
-        less_than_or_equal_to: "måste vara mindre än eller lika med %{count}"
-        odd: "måste vara udda"
-        even: "måste vara jämnt"
-        record_invalid: "Ett fel uppstod: %{errors}"
         # Append your own errors here or at the model/attributes scope.
 
       # You can define own errors for models or model attributes.