diff --git a/config/locales/devise/devise.hu.yml b/config/locales/devise/devise.hu.yml
index 0f2e50e47befd899b6489ba91792d3a7df79cc2c..d5cbb1d06d8b5ad24e4db1d77b2d6d2ef2d09b8f 100644
--- a/config/locales/devise/devise.hu.yml
+++ b/config/locales/devise/devise.hu.yml
@@ -66,9 +66,9 @@ hu:
         alpha_software: "Alfa állapotú szoftvert fogsz használni."
         bugs_and_feedback: "Légy felkészülve, hogy találsz majd hibákat a rendszerben. Ajánljuk, hogy használd a Visszajelzés gombot a jobb oldalon, hogy jelezd a hibákat felénk. Mi minden tőlünk telhetőt megteszünk, hogy minél gyorsabban kijavítsuk a hibát."
         bugs_and_feedback_mobile: "Légy türelmes, hibákat fogsz találni. Szeretnénk, ha minden hibát jelentenél nekünk. Megpróbáljuk olyan gyorsan megoldani őket, ahogy csak tudjuk."
-        have_a_problem: "Problémád van? Itt keresd a választ:"
+        have_a_problem: "Problémád van?"
         login: "Bejelentkezés"
-        modern_browsers: "csak mai böngészőket támogat"
+        modern_browsers: "csak modern böngészőket támogatunk."
         password: "Jelszó"
         remember_me: "Emlékezzen rám"
         sign_in: "Bejelentkezés"
diff --git a/config/locales/devise/devise.sl.yml b/config/locales/devise/devise.sl.yml
index 68f813c199ea485ad4bc17cc78957eae2f949641..b576c07cd0a098f416ce3abec95ae4ba1d417329 100644
--- a/config/locales/devise/devise.sl.yml
+++ b/config/locales/devise/devise.sl.yml
@@ -39,7 +39,7 @@ sl:
         have_invited_you: "%{names} so vas povabili, da se pridružite v Diasporo"
       reset_password_instructions: 
         change: "Spremeni geslo"
-        ignore: "V kolikor tega niste zahtevali, vzamite to e-sporčilo kot brezpredmetno."
+        ignore: "V kolikor tega niste zahtevali, vzamite to e-sporočilo kot brezpredmetno."
         someone_requested: "Nekdo je zahteval povezavo za spremembo vašega gesla, kar lahko storite s pomočjo spodnje povezave."
         subject: "Navodila za ponastavitev gesla"
         wont_change: "Vaše geslo lahko spremenite s pomočjo zgornje povezave ter z vpisom novega gesla."
@@ -68,9 +68,9 @@ sl:
         bugs_and_feedback_mobile: "Opozarjamo vas, da lahko naletite na napake. Veseli bomo vsake vaše prijave napake, ki jo bomo poskusili obravnavati in rešiti v najkrajšem možnem času."
         have_a_problem: "Imate težavo? Tukaj poiščite odgovor"
         login: "Prijava"
-        modern_browsers: "podpira le noveše spletne brskalnike."
+        modern_browsers: "podpira le novejše spletne brskalnike."
         password: "Geslo"
-        remember_me: "Zapomni me"
+        remember_me: "Zapomni si me"
         sign_in: "Prijavi se"
         username: "Uporabniško ime"
       signed_in: "Vaša prijava je uspešna."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 3e8acea774996b455857dfe50326f40150285947..9dbcf2ac47f3afbfe34bcd57ee7579632486c7bb 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -4,7 +4,11 @@
 
 
 ar: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "fotos"
   _services: "Servicios"
@@ -45,11 +49,6 @@ ar:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ ar:
       success: ".من الذي يمكنه مشاهدة مظهرك الجديد Diaspora انقر على علامة الزائد على الجانب الأيسر لتقول ل"
     destroy: 
       success: ".بنجاح %{name} تم إزالة"
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ ar:
       remove: "حذف"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "أضف جانبا جديدا"
       add_a_new_contact: "Add a new contact"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 255e901059c448444f1d8081371977490c9ea72d..a213a5a9a4797da2300c08a088e9e26630a0408b 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -4,7 +4,11 @@
 
 
 ca: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comentaris"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Inici"
   _photos: "fotografies"
   _services: "Serveis"
@@ -45,11 +49,6 @@ ca:
     add_to_aspect: 
       failure: "Error a l'afegir el contacte a aquest aspecte."
       success: "S'ha agregat correctament el seu contacte a un aspecte."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ ca:
       success: "El teu nou aspecte %{name} ha estat creat"
     destroy: 
       success: "%{name} ha estat eliminat correctament."
-    edit_aspect_pane: 
-      add_existing: "Afegir un contacte existent"
-      confirm_remove_aspect: "Eliminar aspecte?"
-      remove_aspect: "Eliminar aspecte"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ ca:
       remove: "eliminar"
     index: 
       handle_explanation: "Aquesta és la teva direcció Diaspora. Com una direcció d'E-Mail, pots donar-la a gent perquè et trobi"
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Afegir un nou aspecte"
       add_a_new_contact: "Afegir un nou contacte"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 5dbd5542bf9ab4e0a3b5a67cc9f6b1af1d46c496..7ec40ebda68824de94e11170f9832b18c31b9df8 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -4,7 +4,11 @@
 
 
 cs: 
+  _aspect: "Aspekt"
+  _aspects: "Aspekty"
   _comments: "Komentáře"
+  _contact: "Kontakt"
+  _contacts: "Kontakty"
   _home: "Doma"
   _photos: "fotky"
   _services: "Služby"
@@ -45,11 +49,6 @@ cs:
     add_to_aspect: 
       failure: "Přidání kontaktu do aspektu selhalo."
       success: "Kontakt byl úspěšně přidán do aspektu."
-    all_aspects_contacts: 
-      all_contacts: "VÅ¡echny kontakty"
-      aspects: "Aspekty"
-      manage_aspects: "upravit aspekty"
-      no_contacts: "Nemáte žádné kontakty. Vyhledejte je zde."
     aspect_contacts: 
       done_editing: "ukončit úpravy"
     create: 
@@ -57,9 +56,9 @@ cs:
       success: "Váš nový aspekt %{name} byl vytvořen"
     destroy: 
       success: "%{name} byl úspěšně odebrán."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Přidat existující kontakt"
-      confirm_remove_aspect: "Opravdu odstranit tento aspekt?"
+      confirm_remove_aspect: "Opravdu chcete odstranit tento aspekt?"
       remove_aspect: "Odstranit tento aspekt"
       rename_aspect: "Přejmenovat aspekt"
     helper: 
@@ -68,6 +67,7 @@ cs:
       remove: "odebrat"
     index: 
       handle_explanation: "Toto je váš Diaspora identifikátor. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
+      no_contacts: "Žádné kontakty"
     manage: 
       add_a_new_aspect: "Přidat aspekt"
       add_a_new_contact: "Přidat nový kontakt"
@@ -262,7 +262,7 @@ cs:
       does_not_exist: "Osoba neexistuje!"
       incoming_request: "Máte příchozí žádost od tohoto kontaktu."
       no_posts: "žádné zprávy k zobrazení!"
-      not_connected: "Nejste spřáteleni s %{name}"
+      not_connected: "Nesdílíte s %{name}"
       recent_posts: "Poslední příspěvky"
       recent_public_posts: "Poslední veřejné příspěvky"
       return_to_aspects: "Návrat na vaši stránku s aspekty"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index df0ead10cba856f92e5834388f42e66cc12a730c..f087f61dd2bf6ee5e6c43b792677646c463fa37e 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -4,7 +4,11 @@
 
 
 cy: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "Photos"
   _services: "Services"
@@ -45,11 +49,6 @@ cy:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ cy:
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       success: "%{name} was successfully removed."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ cy:
       remove: "remove"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Add a new aspect"
       add_a_new_contact: "Add a new contact"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index db98453c5018cf0f55d7798898de0acf0eeea7a0..1881ebaa0de915b7358a05f5c9810f5efed7c478 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -4,7 +4,11 @@
 
 
 da: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Kommentarer"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Hjem"
   _photos: "Billeder"
   _services: "Tjenester"
@@ -45,11 +49,6 @@ da:
     add_to_aspect: 
       failure: "Kunne ikke tilføje kontakten til aspektet."
       success: "Kontakt blev tilføjet aspektet."
-    all_aspects_contacts: 
-      all_contacts: "Alle kontakter"
-      aspects: "Aspekter"
-      manage_aspects: "Administrér aspekter"
-      no_contacts: "Du har i øjeblikket ingen kontakter. Find dine kontakter her."
     aspect_contacts: 
       done_editing: "afslut redigering"
     create: 
@@ -57,10 +56,10 @@ da:
       success: "Klik på plusset i venstre side for at fortælle diaspora, hvem der kan se dit nye aspekt."
     destroy: 
       success: "%{name} fjernet."
-    edit_aspect_pane: 
-      add_existing: "Tilføj eksisterende kontakt"
-      confirm_remove_aspect: "Fjern aspekt?"
-      remove_aspect: "Fjern aspekt"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Er du sikker på at du vil fjerne dette aspekt?"
@@ -68,6 +67,7 @@ da:
       remove: "slet"
     index: 
       handle_explanation: "Dette er dit diaspora handle. Som med en e-mail-adresse, kan du give denne til folk, så de kan kontakte dig."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Tilføj et nyt aspekt"
       add_a_new_contact: "Tilføj en ny kontaktperson"
@@ -178,7 +178,7 @@ da:
   next: "Næste"
   no_new_notifications: "Ingen nye notifikationer"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "også kommenteret på"
     comment_on_post: "kommenterede et af dine"
     deleted: "slettet"
     index: 
@@ -188,13 +188,13 @@ da:
     request_accepted: "accepterede din anmodning."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "har også kommenteret på %{post_author}'s post:"
+      sign_in: "Log in for at se det."
+      subject: "%{name} har også kommenteret."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "har kommenteret på din post!"
+      sign_in: "Log in for at se det."
+      subject: "%{name} har kommenteret på din post!"
     diaspora: "Diaspora e-mail robotten"
     hello: "Hej %{name}!"
     love: "Hilsen,"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 38c00fb3bfc9c5edb460d2dbeac33ed7de618914..ceb704b2087c6ebaa8a61efb86f5b07834885ded 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -4,7 +4,11 @@
 
 
 de: 
+  _aspect: "Aspekt"
+  _aspects: "Aspekte"
   _comments: "Kommentare"
+  _contact: "Kontakt"
+  _contacts: "Kontakte"
   _home: "Start"
   _photos: "Fotos"
   _services: "Dienste"
@@ -45,11 +49,6 @@ de:
     add_to_aspect: 
       failure: "Hinzufügen des Kontakts zum Aspekt fehlgeschlagen."
       success: "Kontakt erfolgreich zum Aspekt hinzugefügt."
-    all_aspects_contacts: 
-      all_contacts: "Alle Kontakte"
-      aspects: "Aspekte"
-      manage_aspects: "Aspekte verwalten"
-      no_contacts: "Du hast zurzeit keine Kontakte. Finde hier deine Kontakte."
     aspect_contacts: 
       done_editing: "Änderungen abgeschlossen"
     create: 
@@ -57,10 +56,10 @@ de:
       success: "Dein neuer Aspekt %{name} wurde erstellt."
     destroy: 
       success: "%{name} wurde erfolgreich entfernt."
-    edit_aspect_pane: 
-      add_existing: "Bestehenden Kontakt hinzufügen"
-      confirm_remove_aspect: "Möchtest du diesen Aspekt wirklich löschen?"
-      remove_aspect: "Diesen Aspekt löschen"
+    edit: 
+      add_existing: "Ein bereits bestehendes Konto hinzufügen"
+      confirm_remove_aspect: "Bist du dir sicher, dass du diesen Aspekt löschen möchtest?"
+      remove_aspect: "Aspekt löschen"
       rename_aspect: "Aspekt umbenennen"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
@@ -68,6 +67,7 @@ de:
       remove: "entfernen"
     index: 
       handle_explanation: "Das ist deine Diaspora-Adresse. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
+      no_contacts: "Keine Kontakte"
     manage: 
       add_a_new_aspect: "Neuen Aspekt hinzufügen"
       add_a_new_contact: "Neuen Kontakt hinzufügen"
@@ -178,7 +178,7 @@ de:
   next: "Nächste"
   no_new_notifications: "keine neuen Benachrichtigungen"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "hinterließ einen Kommentar zu"
     comment_on_post: "kommentierte deinen"
     deleted: "gelöschten"
     index: 
@@ -188,9 +188,9 @@ de:
     request_accepted: "hat deine Teilen-Anfrage angenommen."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "hat den Beitrag von %{post_author} ebenfalls kommentiert:"
+      sign_in: "Melde dich an, um ihn anzuzeigen."
+      subject: "%{name} hat einen Kommentar hinterlassen."
     comment_on_post: 
       commented: "hat deinen Eintrag kommentiert!"
       sign_in: "Melde dich an um dies zu sehen."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 5ef4c8a289974aad5185cbb29d4213a6ef4ba94c..df590b8d850725817c904909cb467ee16c6e7397 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -4,7 +4,11 @@
 
 
 el: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Σχόλια"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Αρχική"
   _photos: "φωτογραφίες"
   _services: "Υπηρεσίες"
@@ -45,11 +49,6 @@ el:
     add_to_aspect: 
       failure: "Αποτυχία προσθήκης επαφής στην πτυχή."
       success: "Επιτυχής προσθήκη επαφής στην πτυχή."
-    all_aspects_contacts: 
-      all_contacts: "Όλες οι επαφές"
-      aspects: "Πτυχές"
-      manage_aspects: "διαχείρηση πτυχών"
-      no_contacts: "Δεν έχετε ακόμα επαφές. Βρείτε τις επαφές σας εδώ."
     aspect_contacts: 
       done_editing: "ολοκλήρωση επεξεργασίας"
     create: 
@@ -57,10 +56,10 @@ el:
       success: "Η νέα σας πτυχή %{name} δημιουργήθηκε"
     destroy: 
       success: "Ο χρήστης %{name} αφαιρέθηκε επιτυχώς."
-    edit_aspect_pane: 
-      add_existing: "Προσθήκη μιας υπάρχουσας επαφής"
-      confirm_remove_aspect: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
-      remove_aspect: "Διαγραφή αυτής της πτυχής"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
@@ -68,6 +67,7 @@ el:
       remove: "αφαίρεση"
     index: 
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora. Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να μπορέσουν να σας βρουν."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Προσθέστε μια νέα πτυχή"
       add_a_new_contact: "Προσθήκη νέας επαφής"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 7872fef79d8cbde1f78850726d11a06dfa7ddfb1..dd1aede17146de40945ddd8795845f8edf251e1c 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -4,7 +4,11 @@
 
 
 en_shaw: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "𐑓𐑴𐑑𐑴𐑟"
   _services: "Services"
@@ -45,11 +49,6 @@ en_shaw:
     add_to_aspect: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑨𐑛 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑."
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑨𐑛𐑩𐑛 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑."
-    all_aspects_contacts: 
-      all_contacts: "𐑷𐑤 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-      aspects: "𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-      manage_aspects: "𐑥𐑨𐑯𐑩𐑡 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-      no_contacts: "𐑿 𐑒𐑻𐑩𐑯𐑑𐑤𐑦 𐑣𐑨𐑝 𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕. 𐑓𐑲𐑯𐑛 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑣𐑽."
     aspect_contacts: 
       done_editing: "𐑛𐑳𐑯 𐑧𐑛𐑦𐑑𐑦𐑙"
     create: 
@@ -57,10 +56,10 @@ en_shaw:
       success: "𐑿𐑼 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑 %{name} 𐑢𐑪𐑟 𐑒𐑮𐑦𐑱𐑑𐑩𐑛"
     destroy: 
       success: "%{name} 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑮𐑦𐑥𐑵𐑝𐑛."
-    edit_aspect_pane: 
-      add_existing: "𐑨𐑛 𐑩𐑯 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
-      confirm_remove_aspect: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
-      remove_aspect: "𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
@@ -68,6 +67,7 @@ en_shaw:
       remove: "𐑮𐑦𐑥𐑵𐑝"
     index: 
       handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
       add_a_new_contact: "𐑨𐑛 𐑩 𐑯𐑿 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
@@ -178,7 +178,7 @@ en_shaw:
   next: "𐑯𐑧𐑒𐑕𐑑"
   no_new_notifications: "𐑯𐑴 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯"
     comment_on_post: "𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼"
     deleted: "𐑛𐑦𐑤𐑰𐑑𐑩𐑛"
     index: 
@@ -188,13 +188,13 @@ en_shaw:
     request_accepted: "𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
+      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
+      subject: "%{name} 𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑!"
+      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
+      subject: "%{name} 𐑣𐑨𐑟 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑."
     diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
     love: "𐑤𐑳𐑝,"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 3aafbe143711a1e448332c39d7c41dbaeed25ec6..1629598a0fde2095868b5f86401b534f07c6776a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -4,7 +4,11 @@
 
 
 eo: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Hejmo"
   _photos: "bildoj"
   _services: "Services"
@@ -45,11 +49,6 @@ eo:
     add_to_aspect: 
       failure: "Failed to add contact to aspect."
       success: "Successfully added contact to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ eo:
       success: "Your new aspect %{name} was created"
     destroy: 
       success: "%{name} was successfully removed."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ eo:
       remove: "remove"
     index: 
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Add a new aspect"
       add_a_new_contact: "Aldoni novan kontakton"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 5fe805247954a6affe55331e8f1a238ce2165d2a..17db0dd2e1c31daf3e05b765e1eafca45acdf24d 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -4,7 +4,11 @@
 
 
 es-CL: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comentarios"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Inicio"
   _photos: "fotos"
   _services: "Servicios"
@@ -45,11 +49,6 @@ es-CL:
     add_to_aspect: 
       failure: "Error al agregar el contacto a este aspecto."
       success: "Contacto agregado correctamente al aspecto."
-    all_aspects_contacts: 
-      all_contacts: "Todos los contactos"
-      aspects: "Aspectos"
-      manage_aspects: "manage aspects"
-      no_contacts: "Actualmente no tienes contactos. Encuentra tus contactos aquí."
     aspect_contacts: 
       done_editing: "editado"
     create: 
@@ -57,10 +56,10 @@ es-CL:
       success: "Tu nuevo aspecto %{name} fué creado"
     destroy: 
       success: "%{name} fue correctamente eliminado."
-    edit_aspect_pane: 
-      add_existing: "Agregar un contacto existente"
-      confirm_remove_aspect: "¿Estás seguro que quieres borrar este aspecto?"
-      remove_aspect: "Eliminar este aspecto"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "¿Estás seguro que quieres eliminar este aspecto?"
@@ -68,6 +67,7 @@ es-CL:
       remove: "eliminar"
     index: 
       handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Agregar un nuevo aspecto"
       add_a_new_contact: "Agregar un nuevo contacto"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 764ab1546b5dade049661747bd467547a06e4a7f..a135416c400af819bfce006e436b313ba8a6d49a 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -4,7 +4,11 @@
 
 
 es: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comentarios"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Inicio"
   _photos: "fotos"
   _services: "Servicios"
@@ -45,11 +49,6 @@ es:
     add_to_aspect: 
       failure: "Error al añadir el contacto a este aspecto."
       success: "Se ha agregado correctamente su contacto a un aspecto."
-    all_aspects_contacts: 
-      all_contacts: "Todos los contactos"
-      aspects: "Aspectos"
-      manage_aspects: "manage aspects"
-      no_contacts: "Por el momento no tienes contactos. Encuentralos aqui."
     aspect_contacts: 
       done_editing: "Edición lista"
     create: 
@@ -57,10 +56,10 @@ es:
       success: "Tu nuevo aspecto %{name} ha sido creado"
     destroy: 
       success: "%{name} fue eliminado correctamente."
-    edit_aspect_pane: 
-      add_existing: "Añadir un contacto existente"
-      confirm_remove_aspect: "Remover aspecto?"
-      remove_aspect: "Remover Aspecto"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "¿Estás seguro de que quieres eliminar este aspecto?"
@@ -68,6 +67,7 @@ es:
       remove: "remover"
     index: 
       handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de email, puedes dársela a gente para que te encuentren"
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Añadir un nuevo aspecto"
       add_a_new_contact: "Añadir un nuevo Contacto"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e4c77d45725dbb9c1780d6d012397c1a542d7e4d..29d13fab38164f46ed95c436e4ea10cf1d096e6c 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -4,7 +4,11 @@
 
 
 fi: 
+  _aspect: "Näkymä"
+  _aspects: "Näkymät"
   _comments: "Kommentit"
+  _contact: "Kontakti"
+  _contacts: "Kontaktit"
   _home: "Etusivu"
   _photos: "kuvat"
   _services: "Ulkoiset palvelut"
@@ -45,11 +49,6 @@ fi:
     add_to_aspect: 
       failure: "Kontaktin lisäys näkymään epäonnistui."
       success: "Ystävän lisäys näkymään onnistui."
-    all_aspects_contacts: 
-      all_contacts: "Kaikki kontaktit"
-      aspects: "Verkostonäkymät"
-      manage_aspects: "Hallitse näkymiä"
-      no_contacts: "Sinulla ei vielä ole kontakteja.  Etsi kontaktejasi täältä."
     aspect_contacts: 
       done_editing: "muokkaus valmis"
     create: 
@@ -57,9 +56,9 @@ fi:
       success: "Uusi näkymäsi, %{name}, on luotu"
     destroy: 
       success: "%{name} poistettiin onnistuneesti."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Lisää olemassa oleva kontakti"
-      confirm_remove_aspect: "Oletko varma, että haluat poistaa tämän näkymän?"
+      confirm_remove_aspect: "Oletko varma että haluat poistaa tämän näkymän?"
       remove_aspect: "Poista näkymä"
       rename_aspect: "Nimeä näkymä uudelleen"
     helper: 
@@ -68,6 +67,7 @@ fi:
       remove: "poista"
     index: 
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
+      no_contacts: "Ei kontakteja"
     manage: 
       add_a_new_aspect: "Lisää uusi näkymä"
       add_a_new_contact: "Lisää uusi kontakti"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 12350d825599fcdbfa1d630f48184919f83317d4..4f6c666c3953745a3b0a85523187e7f432ff1a81 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -4,7 +4,11 @@
 
 
 fr: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Commentaires"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Accueil"
   _photos: "photos"
   _services: "Services"
@@ -45,11 +49,6 @@ fr:
     add_to_aspect: 
       failure: "L’ajout du contact à l’aspect a échoué."
       success: "Vous avez ajouté le contact à l’aspect avec succès."
-    all_aspects_contacts: 
-      all_contacts: "Tous les contacts"
-      aspects: "Aspects"
-      manage_aspects: "gestion des aspects"
-      no_contacts: "Vous n'avez pas de contacts pour l'instant. Recherchez des contacts ici."
     aspect_contacts: 
       done_editing: "fin de la modification"
     create: 
@@ -57,17 +56,18 @@ fr:
       success: "Votre nouvel aspect %{name} a été créé."
     destroy: 
       success: "%{name} a été supprimé avec succès."
-    edit_aspect_pane: 
-      add_existing: "Ajouter un contact existant"
-      confirm_remove_aspect: "Voulez-vous vraiment supprimer cet aspect ?"
-      remove_aspect: "Supprimer cet aspect"
-      rename_aspect: "Renommer l'aspect"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
+      rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
       handle_explanation: "Ceci est votre handle diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
       add_a_new_contact: "Ajouter un nouveau contact"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 41c516de5f6d0be331f0eff5292225d518b664a2..076085f5003cf3ea4c0f121cead4e663d0d44392 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -4,7 +4,11 @@
 
 
 ga: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Nótaí tráchta"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Abhaile"
   _photos: "pictíurí"
   _services: "Seirbhísí"
@@ -45,11 +49,6 @@ ga:
     add_to_aspect: 
       failure: "Níor éirigh leis an teagmháil a chuir leis an gné."
       success: "D'eirigh le teagmháil a chuir le gné."
-    all_aspects_contacts: 
-      all_contacts: "Gach teagmháil"
-      aspects: "gnéanna"
-      manage_aspects: "bainistiú gnéanna"
-      no_contacts: "Níl aon teaghmháilí agat. Faigh do teagmháilí anseo."
     aspect_contacts: 
       done_editing: "críochnaithe ag aithriú"
     create: 
@@ -57,10 +56,10 @@ ga:
       success: "Bhí do gné nua, {%name}, cruthaithe"
     destroy: 
       success: "Fuaireadh ré le %{name}"
-    edit_aspect_pane: 
-      add_existing: "Cuir teagmháilí a bhfuil ann cheanna féin leis"
-      confirm_remove_aspect: "An bhfuil tu cinnte go bhfuil tú ag iarraidh an gné seo a scriosadh?"
-      remove_aspect: "Scrios an gné seo"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ ga:
       remove: "bhain"
     index: 
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Cuir gné nua leis"
       add_a_new_contact: "Cuir teagmháil leis"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl-ES.yml
index 968cf39acdf7d460f1f728bca91ee8a10ba8a147..937102cf0ccca54895bb9972c45e96ec5a621a31 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl-ES.yml
@@ -4,7 +4,11 @@
 
 
 gl-ES: 
+  _aspect: "Aspecto"
+  _aspects: "Aspectos"
   _comments: "Comentarios"
+  _contact: "Contacto"
+  _contacts: "Contacts"
   _home: "Inicio"
   _photos: "fotos"
   _services: "Servizos"
@@ -45,11 +49,6 @@ gl-ES:
     add_to_aspect: 
       failure: "Non se puido engadir o contacto á aparencia."
       success: "Engadiuse correctamente o contacto coa aparencia."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ gl-ES:
       success: "A súa nova aparencia %{name} foi creada"
     destroy: 
       success: "%{name} foi eliminado correctamente."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ gl-ES:
       remove: "eliminar"
     index: 
       handle_explanation: "Esta é a súa tarxeta de diaspora. Coma un enderezo electrónico, podes darllo ás persoas para que te localicen."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Engadir unha nova aparencia"
       add_a_new_contact: "Engadir un novo contacto"
@@ -162,13 +162,13 @@ gl-ES:
       powered_by: "FORNECIDO POR DIASPORA*"
       whats_new: "what's new?"
     header: 
-      account_settings: "account settings"
-      blog: "blog"
+      account_settings: "Configuración da conta"
+      blog: "Bitácora"
       code: "code"
-      edit_profile: "edit profile"
-      login: "login"
-      logout: "logout"
-      view_profile: "view profile"
+      edit_profile: "Modificar o perfil"
+      login: "Identificarse"
+      logout: "Saír"
+      view_profile: "Ver o perfil"
   new_notifications: "%{count} new notifications"
   new_requests: 
     few: "%{count} new requests!"
@@ -195,28 +195,28 @@ gl-ES:
       commented: "has commented on your post!"
       sign_in: "Sign in to view it."
       subject: "%{name} has commented on your post."
-    diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
-    love: "love,"
+    diaspora: "o robot do correo electrónico de Diaspora"
+    hello: "Ola %{name}!"
+    love: "amor,"
     new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      just_sent_you: "acaba de mandarche unha petición de contacto en Diaspora*."
+      sign_in: "Rexistrarse"
+      subject: "Ten unha nova petición de contacto en Diaspora* de %{from}."
+      try_it_out: "Debería pensar seriamente en botarlle unha ollada."
     request_accepted: 
       accepted: "has accepted your contact request. They are now in your"
-      subject: "%{name} has accepted your contact request on Diaspora*"
+      subject: "%{name} aceptouno como contacto en Diaspora*."
     single_admin: 
       admin: "Your Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     thanks: "Thanks,"
-  ok: "OK"
-  or: "or"
+  ok: "Aceptar"
+  or: "ou"
   pagination: 
     next: "Next"
     previous: "Previous"
-  password: "Password"
-  password_confirmation: "Password confirmation"
+  password: "Contrasinal"
+  password_confirmation: "Confirmación do contrasinal"
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 5208fa46fe4c1efe34c042d1518a92db5e267f51..9d98ea778eea10d3ec7197566513f215107e3d9c 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -4,7 +4,11 @@
 
 
 he: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "תגובות"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "בית"
   _photos: "תמונות"
   _services: "שירותים"
@@ -45,11 +49,6 @@ he:
     add_to_aspect: 
       failure: "אירע כשל בהוספת איש הקשר להיבט."
       success: "איש הקשר נוסף בהצלחה להיבט."
-    all_aspects_contacts: 
-      all_contacts: "כל אנשי הקשר"
-      aspects: "היבטים"
-      manage_aspects: "ניהול ההיבטים"
-      no_contacts: "נכון לעכשיו אין לך בכלל אנשי קשר.  ניתן למצוא את אנשי הקשר שלך כאן."
     aspect_contacts: 
       done_editing: "סיום העריכה"
     create: 
@@ -57,10 +56,10 @@ he:
       success: "ההיבט החדש שלך %{name} נוצר"
     destroy: 
       success: "%{name} הוסר בהצלחה."
-    edit_aspect_pane: 
-      add_existing: "הוספת איש קשר קיים"
-      confirm_remove_aspect: "האם אכן ברצונך למחוק היבט זה?"
-      remove_aspect: "מחיקת היבט זה"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
@@ -68,6 +67,7 @@ he:
       remove: "הסרה"
     index: 
       handle_explanation: "זהו שם המשתמש שלך בדיאספורה. כמו כתובת דואר אלקטרוני, ניתן לחלוק אותו עם אנשים כדי שיגיעו אליך."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "הוספת היבט חדש"
       add_a_new_contact: "הוספת איש קשר חדש"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index cc117f263136e7fc5c4b012594c5b0ffa9bdeda1..67043823a8ea3f128756afecb111fd1e528db88d 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -4,7 +4,11 @@
 
 
 hu: 
+  _aspect: "Csoport"
+  _aspects: "Csoportok"
   _comments: "Hozzászólások"
+  _contact: "Kapcsolat"
+  _contacts: "Ismerősök"
   _home: "Kezdőlap"
   _photos: "Képek"
   _services: "Szolgáltatások"
@@ -45,11 +49,6 @@ hu:
     add_to_aspect: 
       failure: "A kapcsolatot nem sikerült felvenni a csoportba."
       success: "A kapcsolat hozzáadva a csoporthoz."
-    all_aspects_contacts: 
-      all_contacts: "Összes ismerős"
-      aspects: "Csoportok"
-      manage_aspects: "csoportok kezelése"
-      no_contacts: "Még nincs ismerősöd felvéve. Itt keresheted meg őket"
     aspect_contacts: 
       done_editing: "szerkesztés kész"
     create: 
@@ -57,17 +56,18 @@ hu:
       success: "Új csoport létrehozva: %{name}"
     destroy: 
       success: "%{name} csoport sikeresen törölve."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Létező kapcsolat hozzáadása"
-      confirm_remove_aspect: "Törlöd ezt a csoportot?"
-      remove_aspect: "csoport törlése"
-      rename_aspect: "Rename aspect"
+      confirm_remove_aspect: "Biztos, hogy törölni akarod a csoportot?"
+      remove_aspect: "Csoport törlése"
+      rename_aspect: "Csoport átnevezése"
     helper: 
       are_you_sure: "Biztos, hogy törlöd a csoportot?"
       aspect_not_empty: "A csoport nem üres"
       remove: "eltávolítás"
     index: 
       handle_explanation: "Ez a Te Diaspora felhasználóneved. Megadhatod elérhetőségként, mint egy email címet."
+      no_contacts: "Nincs ismerős"
     manage: 
       add_a_new_aspect: "Új csoport hozzáadása"
       add_a_new_contact: "Új ismerős hozzáadása"
@@ -160,7 +160,7 @@ hu:
   layouts: 
     application: 
       powered_by: "DIASPORA* fordította ADAMEX"
-      whats_new: "Mizu?"
+      whats_new: "Újdonságok"
     header: 
       account_settings: "Fiók beállítások"
       blog: "blog"
@@ -178,7 +178,7 @@ hu:
   next: "következő"
   no_new_notifications: "nincs új értesítés"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "hozzászólt még ehhez"
     comment_on_post: "hozzászólt a"
     deleted: "törölve"
     index: 
@@ -188,13 +188,13 @@ hu:
     request_accepted: "elfogadta a megosztási kérésed."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "hozzászólt még %{post_author} bejegyzéséhez is:"
+      sign_in: "Jelentkezz be, hogy megnézhesd."
+      subject: "%{name} is hozzászólt."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "hozzászólt a bejegyzésedhez!"
+      sign_in: "Jelentkezz be, hogy megnézd."
+      subject: "%{name} hozzászólt a bejegyzésedhez."
     diaspora: "A diaspora email robot"
     hello: "Szia %{name}!"
     love: "Szeretettel,"
@@ -318,7 +318,7 @@ hu:
       edit: "%{name} szerkesztése"
       leave_blank: "(Hagyd üresen, ha nem akarod megváltoztatni)"
       password_to_confirm: "(Szükségünk van a jelenlegi jelszavadra, hogy jóváhagyd a változást)"
-      unhappy: "Boldogtalan vagy?"
+      unhappy: "Elégedetlen?"
       update: "Frissítés"
     new: 
       enter_email: "Írd be az e-mail címed"
@@ -396,7 +396,7 @@ hu:
       no_message_to_display: "Nincs üzenet."
     new_status_message: 
       oh_yeah: "Ez az!"
-      tell_me_something_good: "Mondj valami jót!"
+      tell_me_something_good: "Mondj valamit!"
     show: 
       destroy: "Töröl"
       permalink: "permalink"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 37a93c0619758e066958300d753e641eddfde011..c7ef80f824adb67fead04b8c9d6346ef29884553 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -4,7 +4,11 @@
 
 
 id: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "photos"
   _services: "Services"
@@ -45,11 +49,6 @@ id:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ id:
       success: "Klik pada tanda plus di sisi kiri untuk memberitahu Diaspora siapa yang dapat melihat aspek baru Anda."
     destroy: 
       success: "%{name} berhasil dihapus."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ id:
       remove: "hapus"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Tambah aspek baru"
       add_a_new_contact: "Add a new contact"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index ee4d59c4e805ad17ac76db2555d374677dcbb7ad..db47ddbdea3461f8c76964ec6b8f37252edf6d9d 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -4,7 +4,11 @@
 
 
 it: 
+  _aspect: "Aspetto"
+  _aspects: "Aspetti"
   _comments: "Commenti"
+  _contact: "Contatto"
+  _contacts: "Contatti"
   _home: "Home"
   _photos: "foto"
   _services: "Servizi"
@@ -15,23 +19,23 @@ it:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "deve essere univoco tra i contatti di questo utente."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "non è disponibile"
+              taken: "non è disponibile."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "è un duplicato di una richiesta preesistente."
         user: 
           attributes: 
             email: 
-              taken: "è già stato usato"
+              taken: "non è disponibile."
             person: 
-              invalid: "non è valido"
+              invalid: "non è valido."
             username: 
-              taken: "non è disponibile"
+              taken: "non è disponibile."
   ago: "%{time} fa"
   application: 
     helper: 
@@ -39,17 +43,12 @@ it:
         all_aspects: "Tutti gli aspetti"
       unknown_person: "persona sconosciuta"
       video_title: 
-        unknown: "Unknown Video Title"
+        unknown: "Video Senza Nome"
   are_you_sure: "Sei sicuro?"
   aspects: 
     add_to_aspect: 
       failure: "Errore nell'aggiungere il contatto all'aspetto."
       success: "Contatto aggiunto all'aspetto con successo."
-    all_aspects_contacts: 
-      all_contacts: "Tutti i contatti"
-      aspects: "Aspetto"
-      manage_aspects: "manage aspects"
-      no_contacts: "Al momento non hai alcun contatto.  Clicca qui per trovare nuovi contatti."
     aspect_contacts: 
       done_editing: "modifica eseguita"
     create: 
@@ -57,17 +56,18 @@ it:
       success: "Clicca sul segno più nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto."
     destroy: 
       success: "%{name} è stato rimosso con successo."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Aggiungi un contatto esistente"
-      confirm_remove_aspect: "Rimuovere l'aspetto?"
-      remove_aspect: "Rimuovi Aspetto"
-      rename_aspect: "Rename aspect"
+      confirm_remove_aspect: "Sei sicuro di voler eliminare questo aspetto?"
+      remove_aspect: "Elimina questo aspetto"
+      rename_aspect: "Rinomina aspetto"
     helper: 
       are_you_sure: "Sei sicuro di voler eliminare questo aspetto?"
       aspect_not_empty: "Aspetto non vuoto"
       remove: "rimuovi"
     index: 
       handle_explanation: "Questo è il tuo contatto Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
+      no_contacts: "Nessun contatto"
     manage: 
       add_a_new_aspect: "Aggiungi un nuovo aspetto"
       add_a_new_contact: "Aggiungi un nuovo contatto"
@@ -107,9 +107,9 @@ it:
     new_comment: 
       comment: "Commento"
       commenting: "Invio commento in corso..."
-      enter: "enter"
-      press: "press"
-      to_comment: "to comment"
+      enter: "entra"
+      press: "premi"
+      to_comment: "per commentare"
   contacts: 
     few: "%{count} contatti"
     one: "1 contatto"
@@ -160,7 +160,7 @@ it:
   layouts: 
     application: 
       powered_by: "CREATO CON DIASPORA*"
-      whats_new: "what's new?"
+      whats_new: "novità"
     header: 
       account_settings: "impostazioni account"
       blog: "blog"
@@ -169,32 +169,32 @@ it:
       login: "accedi"
       logout: "esci"
       view_profile: "visualizza profilo"
-  new_notifications: "%{count} new notifications"
+  new_notifications: "%{count} nuove notifiche"
   new_requests: 
     few: "%{count} nuove richieste!"
     one: "nuova richiesta!"
     other: "%{count} nuove richieste!"
     zero: "nessuna nuova richiesta"
-  next: "next"
-  no_new_notifications: "no new notifications"
+  next: "successivo"
+  no_new_notifications: "nessuna nuova notifica"
   notifications: 
-    also_commented: "also commented on"
-    comment_on_post: "commented on your"
-    deleted: "deleted"
+    also_commented: "ha anche commentato"
+    comment_on_post: "ha commentato sul tuo"
+    deleted: "eliminato"
     index: 
-      notifications: "Notifications"
-    new_request: "offered to share with you."
+      notifications: "Notifiche"
+    new_request: "vuole condividere con te."
     post: "post"
-    request_accepted: "accepted your share request."
+    request_accepted: "ha accettato la tua richiesta di condivisione."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "ha anche commentato sul post di %{post_author}:"
+      sign_in: "Autenticati per vederlo."
+      subject: "%{name} ha anche commentato."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "ha commentato il tuo post!"
+      sign_in: "Autenticati per vederlo."
+      subject: "%{name} ha commentato il tuo post."
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
     love: "amore,"
@@ -204,11 +204,11 @@ it:
       subject: "nuova richiesta di contatto su Diaspora* da %{from}"
       try_it_out: "Dovresti veramente provarlo."
     request_accepted: 
-      accepted: "ha accettato la tua richiesta di contatto. Adesso sono nella tua"
+      accepted: "ha accettato la tua richiesta di contatto!"
       subject: "%{name} ha accettato la tua richiesta di contatto su Diaspora*"
     single_admin: 
       admin: "Il tuo amministratore Diaspora"
-      subject: "Un messaggio dal tuo amministratore Diaspora:"
+      subject: "Un messaggio sul tuo account Diaspora:"
     thanks: "Grazie,"
   ok: "OK"
   or: "o"
@@ -219,7 +219,7 @@ it:
   password_confirmation: "Conferma password"
   people: 
     aspect_list: 
-      edit_membership: "edit aspect membership"
+      edit_membership: "modifica appartenenza all'aspetto"
     edit: 
       allow_search: "Permetti alle persone di cercarti"
       edit_profile: "Modifica profilo"
@@ -248,7 +248,7 @@ it:
       thats_you: "sei tu!"
     profile_sidebar: 
       bio: "bio"
-      born: "nato"
+      born: "data di nascita"
       cannot_remove: "Impossibile rimuovere %{name} dall'ultimo aspetto."
       edit_my_profile: "Modifica il mio profilo"
       gender: "sesso"
@@ -256,17 +256,17 @@ it:
       remove_contact: "rimuovi contatto"
       remove_from: "Rimuovere %{name} da %{aspect}?"
     share_with: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      share_with: "Start sharing with %{name}"
+      accepts: "Quando %{name} avrà accettato, ognuno comincerà a vedere i post Diaspora dell'altro"
+      share_with: "Inizia a condividere con %{name}"
     show: 
       does_not_exist: "La persona non esiste!"
       incoming_request: "Hai ricevuto una richiesta da questa persona."
       no_posts: "nessun post da mostrare!"
-      not_connected: "Non sei in contatto con questa persona"
+      not_connected: "Non sei in contatto con %{name}"
       recent_posts: "Post Recenti"
       recent_public_posts: "Post pubblici recenti"
       return_to_aspects: "Torna alla pagina dei tuoi aspetti"
-      similar_contacts: "similar contacts"
+      similar_contacts: "contatti simili"
       to_accept_or_ignore: "per accettarla o ignorarla."
     update: 
       failed: "Impossibile aggiornare il profilo"
@@ -303,11 +303,11 @@ it:
       permalink: "permalink"
       update_photo: "Aggiorna Foto"
       view: "guarda"
-      view_original_post: "view original post"
+      view_original_post: "vedi post originale"
     update: 
       error: "Modifica della foto fallita."
       notice: "Foto aggiornata con successo."
-  previous: "previous"
+  previous: "precedente"
   profile: "Profilo"
   registrations: 
     closed: "Le iscrizioni sono chiuse su questo pod Diaspora."
@@ -398,7 +398,7 @@ it:
       oh_yeah: "oh si!"
       tell_me_something_good: "dimmi qualcosa di buono"
     show: 
-      destroy: "Distruggi"
+      destroy: "Elimina"
       permalink: "permalink"
   stream_helper: 
     hide_comments: "nascondi i commenti"
@@ -415,7 +415,7 @@ it:
       download_photos: "scarica le mie"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
-      email_notifications: "Notifiche email "
+      email_notifications: "Notifiche email"
       export_data: "Esporta Dati"
       new_password: "Nuova Password"
       receive_email_notifications: "Vuoi ricevere notifiche via email?"
@@ -452,7 +452,7 @@ it:
     public: 
       does_not_exist: "L'utente %{username} non esiste!"
     update: 
-      email_notifications_changed: "Impossibile cambiare la lingua"
+      email_notifications_changed: "Notifiche email modificate con successo"
       language_changed: "Lingua Cambiata"
       language_not_changed: "Cambio di lingua fallito"
       password_changed: "Password Cambiata"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 7a2f13884492d41d5c60e509edae72597db9f760..adb9cc266cc32db5e5f8b0797485c7c38e573b16 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -4,7 +4,11 @@
 
 
 lt: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Komentarai"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Pradžia"
   _photos: "Nuotraukos"
   _services: "Paslaugos"
@@ -45,11 +49,6 @@ lt:
     add_to_aspect: 
       failure: "Nepavyko pridėti draugo į aspektą."
       success: "Draugas į aspektą pridėtas sėkmingai."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ lt:
       success: "Spustelk pliusÄ… kairÄ—je ir nurodyk, kas Diasporoje gali matyti tavo naujÄ… aspektÄ…."
     destroy: 
       success: "%{name} sėkmingai pašalintas."
-    edit_aspect_pane: 
-      add_existing: "Pridėk egzistuojantį kontaktą"
-      confirm_remove_aspect: "Pašalinti aspektą?"
-      remove_aspect: "Pašalinti aspektą"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ lt:
       remove: "Å¡alinti"
     index: 
       handle_explanation: "Tai tavo vartotojo vardas Diasporoje. Kaip ir el. pašto adresas, jis leidžia sistemoje rasti pažįstamus."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "PridÄ—ti naujÄ… aspektÄ…"
       add_a_new_contact: "PridÄ—ti naujÄ… kontaktÄ…"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index de4db77c9c678c18e6f0a063f2d08aebaa64d433..716cc31ecee056ac1e001e0c99bbf4858f8c95b7 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -4,7 +4,11 @@
 
 
 mk: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Коментари"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Дома"
   _photos: "фотографии"
   _services: "Сервиси"
@@ -45,11 +49,6 @@ mk:
     add_to_aspect: 
       failure: "Неуспешно додавање на контактот во аспект."
       success: "Успешно додаден контактот во аспект."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ mk:
       success: "Вашиот нов аспект %{name} е креиран"
     destroy: 
       success: "%{name} е отстранет успешно."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ mk:
       remove: "одстрани"
     index: 
       handle_explanation: "Ова е вашето diaspora корисничко име. Исто како е-маил адреса, можете да го давате на луѓе за да се сврзат со вас."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Додај нов аспект"
       add_a_new_contact: "Додај нов контакт"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index a17d8c73594c2be6840410606864e8a588a2437e..440026cb752cd304140353657768b6d57be1b555 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -4,7 +4,11 @@
 
 
 nb: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "photos"
   _services: "Services"
@@ -45,11 +49,6 @@ nb:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ nb:
       success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
     destroy: 
       success: "%{name} har blitt fjerna."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ nb:
       remove: "fjern"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Legg til et nytt aspekt"
       add_a_new_contact: "Add a new contact"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index ec976acab1c1a9f9f16d9d0fdfbd6cad77530ba3..7c0c75b1bf8dc950b8dece48969f26b6b90181a7 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -4,7 +4,11 @@
 
 
 nl: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Reacties"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "foto's"
   _services: "Services"
@@ -45,11 +49,6 @@ nl:
     add_to_aspect: 
       failure: "Contact toevoegen aan aspect is mislukt."
       success: "Contact is met succes toegevoegd aan aspect."
-    all_aspects_contacts: 
-      all_contacts: "Alle contacten"
-      aspects: "Aspecten"
-      manage_aspects: "beheer aspecten"
-      no_contacts: "Je hebt momenteel geen contacten. Vind je contacten hier!"
     aspect_contacts: 
       done_editing: "klaar met bewerken"
     create: 
@@ -57,17 +56,18 @@ nl:
       success: "Je nieuwe aspect %{name} is aangemaakt"
     destroy: 
       success: "%{name} is met succes verwijderd."
-    edit_aspect_pane: 
-      add_existing: "Voeg een bestaand contact toe"
-      confirm_remove_aspect: "Weet je zeker dat je dit aspect wilt verwijderen?"
-      remove_aspect: "Verwijder dit aspect"
-      rename_aspect: "Hernoem aspect"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
+      rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Weet je zeker dat je dit aspect wilt verwijderen?"
       aspect_not_empty: "Aspect niet leeg"
       remove: "verwijderen"
     index: 
       handle_explanation: "Dit is jouw Diaspora handle. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Voeg een nieuw aspect toe"
       add_a_new_contact: "Voeg contact toe"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 8005c58d30d9823fecc80a0900e6b1e7843ad719..858de548e7eb06cbd6926bd53fc68ce5fd8dc867 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -4,7 +4,11 @@
 
 
 pl: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Komentarze"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Wszyscy"
   _photos: "zdjęcia"
   _services: "Usługi"
@@ -45,11 +49,6 @@ pl:
     add_to_aspect: 
       failure: "Nie udało się dodać kontaktu do aspektu."
       success: "Dodano kontakt to aspektu."
-    all_aspects_contacts: 
-      all_contacts: "Wszystkie kontakty"
-      aspects: "Aspekty"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ pl:
       success: "Twój nowy aspekt, on nazwie %{name}, został utworzony"
     destroy: 
       success: "%{name} został usunięty."
-    edit_aspect_pane: 
-      add_existing: "Dodaj istniejÄ…cy kontakt"
-      confirm_remove_aspect: "Usunąć aspekt?"
-      remove_aspect: "Usuń aspekt"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ pl:
       remove: "usuń"
     index: 
       handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Dodaj nowy aspekt"
       add_a_new_contact: "Dodaj nowy kontakt"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 35af682ee9b2c30dde8b6c4d222d5e6147801593..80ffe2e85ab23b726b3de9f2bd6afe2a49ce7413 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -4,7 +4,11 @@
 
 
 pt-BR: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comentários"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "fotos"
   _services: "Serviços"
@@ -45,11 +49,6 @@ pt-BR:
     add_to_aspect: 
       failure: "Falha ao adicionar contato ao aspecto."
       success: "Contato adicionado ao aspecto."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ pt-BR:
       success: "Seu novo aspecto %{name} foi criado"
     destroy: 
       success: "%{name} foi removido com sucesso."
-    edit_aspect_pane: 
-      add_existing: "Adicionar contato"
-      confirm_remove_aspect: "Remover aspecto?"
-      remove_aspect: "Remover aspecto"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ pt-BR:
       remove: "remover"
     index: 
       handle_explanation: "Este é o seu endereço no diaspora. Como um endereço de e-mail, as pessoas poderão usá-lo para entrar em contato com você."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Adicionar um novo aspecto"
       add_a_new_contact: "Novo contato"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 862fcc8d2691b04d8c5e6273c61429b0574efc2e..32fa14f2960e0c553b21dca70b9a9dc377ddbb7e 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -4,7 +4,11 @@
 
 
 pt-PT: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comentários"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Início"
   _photos: "Fotografias"
   _services: "Serviços"
@@ -45,11 +49,6 @@ pt-PT:
     add_to_aspect: 
       failure: "Falha ao adicionar amigo ao grupo."
       success: "Amigo adicionado com sucesso ao grupo."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ pt-PT:
       success: "O teu novo grupo %{name} foi  criado"
     destroy: 
       success: "%{name} foi removido(a) com sucesso."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ pt-PT:
       remove: "remover"
     index: 
       handle_explanation: "Esta é a tua chave do Diaspora. Tal como um email, podes dar esta chave às pessoas para que te possam contactar."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Adicionar um novo grupo"
       add_a_new_contact: "Adicionar um novo contacto"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c9c880a6dd2de628ea9da251ba5a4b0189d23d8b..dce5eb4e38b7c73641af57b2a37cf2cb9f740b14 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -4,7 +4,11 @@
 
 
 ro: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "poze"
   _services: "Servicii"
@@ -45,11 +49,6 @@ ro:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ ro:
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
       success: "%{name} a fost eliminat cu succes."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ ro:
       remove: "ÅŸterge"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Adaugă aspect"
       add_a_new_contact: "Add a new contact"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 00a276c9e5e53b175cc7eeae166f8bd289f50d01..ee3538e6a0de8dbfcf03f6c0cde90936ce1aa775 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -4,7 +4,11 @@
 
 
 ru: 
+  _aspect: "Аспект"
+  _aspects: "Аспекты"
   _comments: "Коментарии"
+  _contact: "Контакт"
+  _contacts: "Контакты"
   _home: "Домашний"
   _photos: "Фотографии"
   _services: "Сервисы"
@@ -15,23 +19,23 @@ ru:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "должно быть уникальным среди контактов пользователя."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "уже присутствует"
+              taken: "уже занято."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "является дубликатом ранее существовавшего запроса."
         user: 
           attributes: 
             email: 
-              taken: "уже присутствует в базе"
+              taken: "уже занято."
             person: 
-              invalid: "неправильный"
+              invalid: "неправильный."
             username: 
-              taken: "уже занято"
+              taken: "уже занято."
   ago: "%{time} назад"
   application: 
     helper: 
@@ -39,17 +43,12 @@ ru:
         all_aspects: "Все аспекты"
       unknown_person: "неизвестная персона"
       video_title: 
-        unknown: "Unknown Video Title"
+        unknown: "Неизвестное название видеозаписи"
   are_you_sure: "Вы уверены?"
   aspects: 
     add_to_aspect: 
       failure: "Не удалось добавить друга в аспект."
       success: "Друг добавлен в аспект."
-    all_aspects_contacts: 
-      all_contacts: "Все контакты"
-      aspects: "Аспекты"
-      manage_aspects: "manage aspects"
-      no_contacts: "Сейчас у вас нет контактов. Найти попробуйте найти контакты здесь.\n"
     aspect_contacts: 
       done_editing: "редактирование завершено"
     create: 
@@ -57,17 +56,18 @@ ru:
       success: "Ваш новый аспект %{name} создан"
     destroy: 
       success: "%{name} удалён."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Добавить существующий контакт"
-      confirm_remove_aspect: "Вы уверены в том, что собираетесь удалить аспект?"
-      remove_aspect: "Удалить аспект"
-      rename_aspect: "Rename aspect"
+      confirm_remove_aspect: "Вы уверены, что хотите удалить этот аспект?"
+      remove_aspect: "Удалить этот аспект"
+      rename_aspect: "Переименовать аспект"
     helper: 
       are_you_sure: "Вы уверены в том, что хотите удалить этот аспект?"
       aspect_not_empty: "Аспект не пуст"
       remove: "удалить"
     index: 
       handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
+      no_contacts: "Контакты отсутствуют"
     manage: 
       add_a_new_aspect: "Добавить аспект"
       add_a_new_contact: "Добавить новый контакт"
@@ -107,9 +107,9 @@ ru:
     new_comment: 
       comment: "Комментарий"
       commenting: "Комментирование ..."
-      enter: "enter"
-      press: "press"
-      to_comment: "to comment"
+      enter: "вход"
+      press: "пресса"
+      to_comment: "комментировать"
   contacts: 
     few: "%{count} контактов"
     one: "1 контакт"
@@ -160,7 +160,7 @@ ru:
   layouts: 
     application: 
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
-      whats_new: "what's new?"
+      whats_new: "Что нового?"
     header: 
       account_settings: "настройки аккаунта"
       blog: "блог"
@@ -169,32 +169,32 @@ ru:
       login: "логин"
       logout: "выйти"
       view_profile: "просмотр профиля"
-  new_notifications: "%{count} new notifications"
+  new_notifications: "%{count} новых уведомлений"
   new_requests: 
     few: "%{count} новых запросов!"
     one: "новый запрос!"
     other: "%{count} новых запросов!"
     zero: "новых запросов нет"
-  next: "next"
-  no_new_notifications: "no new notifications"
+  next: "далее"
+  no_new_notifications: "новых уведомлений нет"
   notifications: 
-    also_commented: "also commented on"
-    comment_on_post: "commented on your"
-    deleted: "deleted"
+    also_commented: "также прокомментировал"
+    comment_on_post: "комментариев на "
+    deleted: "удален"
     index: 
-      notifications: "Notifications"
-    new_request: "offered to share with you."
-    post: "post"
-    request_accepted: "accepted your share request."
+      notifications: "Уведомления"
+    new_request: "предлагает поделиться с вами."
+    post: "сообщение"
+    request_accepted: "ваш запрос на участие принят."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "также прокомментировал %{post_author} сообщение:\n"
+      sign_in: "Войдите в систему, для дальнейшего просмотра."
+      subject: "%{name} также прокомментировал."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "прокомментировал ваш пост!"
+      sign_in: "Войдите в систему, для дальнейшего просмотра."
+      subject: "%{name} прокомментировал ваш пост."
     diaspora: "почтовый робот Диаспоры"
     hello: "Привет %{name}!"
     love: "С любовью,"
@@ -204,11 +204,11 @@ ru:
       subject: "новый запрос Диаспоры от %{from}"
       try_it_out: "Вы должны подумать о его проверке.\n"
     request_accepted: 
-      accepted: "принял(а) ваш запрос. Сейчас он(а) находятся в вашем\n"
+      accepted: "принял Ваш запрос!"
       subject: "%{name} принял(а) ваш запрос для присоединения к Диаспоре*"
     single_admin: 
       admin: "Ваш администратор Диаспоры"
-      subject: "Сообщение от администратора вашей Диаспоры:"
+      subject: "Сообщение о вашей учётной записи Диаспоры:"
     thanks: "Спасибо,"
   ok: "Ок"
   or: "или"
@@ -219,7 +219,7 @@ ru:
   password_confirmation: "Подтверждение пароля"
   people: 
     aspect_list: 
-      edit_membership: "edit aspect membership"
+      edit_membership: "редактировать участников аспекта"
     edit: 
       allow_search: "Разрешить отображать вас в поиске Диаспоры"
       edit_profile: "Редактировать профиль"
@@ -256,17 +256,17 @@ ru:
       remove_contact: "удалить контакт"
       remove_from: "Удалить %{name} из %{aspect}?"
     share_with: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      share_with: "Start sharing with %{name}"
+      accepts: "После согласия %{name}, вы сможете видеть сообщения друг друга в Диаспоре"
+      share_with: "Начать обмен с %{name}"
     show: 
       does_not_exist: "Персоны не существует !"
       incoming_request: "Вам поступил запрос от этого человека."
       no_posts: "новых сообщений нет!"
-      not_connected: "Вы не связаны с этим человеком"
+      not_connected: "Вы не поделились с %{name}"
       recent_posts: "Последние сообщения"
       recent_public_posts: "Последние Публичные Посты"
       return_to_aspects: "Вернуться на страницу аспектов"
-      similar_contacts: "similar contacts"
+      similar_contacts: "аналогичные контакты"
       to_accept_or_ignore: "принять или игнорировать."
     update: 
       failed: "Не удалось обновить профиль"
@@ -303,11 +303,11 @@ ru:
       permalink: "постоянная ссылка"
       update_photo: "Обновить фотографию"
       view: "смотреть"
-      view_original_post: "view original post"
+      view_original_post: "просмотр оригинального сообщения"
     update: 
       error: "Не удалось изменить фотографию."
       notice: "Фотография загружена."
-  previous: "previous"
+  previous: "предыдущая"
   profile: "Профиль"
   registrations: 
     closed: "В этой части Диаспоры регистрация закрыта"
@@ -415,7 +415,7 @@ ru:
       download_photos: "Скачать мои изображения"
       download_xml: "Скачать мою информацию в xml"
       edit_account: "Редактировать аккаунт"
-      email_notifications: "Почтовое уведомление"
+      email_notifications: "Уведомления по электронной почте"
       export_data: "Экспорт информации"
       new_password: "Новый пароль"
       receive_email_notifications: "Получили письмо уведомление?"
@@ -452,7 +452,7 @@ ru:
     public: 
       does_not_exist: "Пользователя %{username} не существует!"
     update: 
-      email_notifications_changed: "Не удачная смена языка"
+      email_notifications_changed: "Уведомления по электронной почте изменены"
       language_changed: "Язык изменён"
       language_not_changed: "Не удалось изменить язык"
       password_changed: "Пароль изменён"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index c9459c14f8e3a4f9d339433beb3d88a424a7d71b..17bbf322b8ec0c08c30034e39bd7951160d7e402 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -4,7 +4,11 @@
 
 
 sk: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Komentáre"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Domov"
   _photos: "Fotky"
   _services: "Služby"
@@ -45,11 +49,6 @@ sk:
     add_to_aspect: 
       failure: "Pridanie kontaktu do aspektu zlyhalo."
       success: "Kontakt bol úspešne pridaný."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ sk:
       success: "Váš nový aspekt %{name} bol vytvorený"
     destroy: 
       success: "Užívateľ %{name} bol úspešne odstránený."
-    edit_aspect_pane: 
-      add_existing: "Pridať existujúci kontakt"
-      confirm_remove_aspect: "Odstrániť aspekt?"
-      remove_aspect: "Odstrániť aspekt"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ sk:
       remove: "odstrániť"
     index: 
       handle_explanation: "Toto je Vaša adresa a slúži ako vizitka. Pomocou nej Vás môžu ostatní vyhľadať."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Pridať nový aspekt"
       add_a_new_contact: "Pridať nový kontakt"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 492911cba5417b04df0d3dd3108494da1043a158..3f3c0a1d1869e74cab5dd0916835e97394354237 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -4,7 +4,11 @@
 
 
 sl: 
+  _aspect: "Vidik"
+  _aspects: "Vidiki"
   _comments: "Komentarji"
+  _contact: "Kontakt"
+  _contacts: "Kontakti"
   _home: "Domov"
   _photos: "slike"
   _services: "Servisi"
@@ -45,11 +49,6 @@ sl:
     add_to_aspect: 
       failure: "Dodajanje stika v skupino ni uspelo."
       success: "Dodajanje stika v skupino je uspelo."
-    all_aspects_contacts: 
-      all_contacts: "Vsi stiki"
-      aspects: "Skupine"
-      manage_aspects: "uredi skupine"
-      no_contacts: "Trenutno ste brez stikov. Tukaj poiščite vaše stike."
     aspect_contacts: 
       done_editing: "zaključi urejanje"
     create: 
@@ -57,21 +56,22 @@ sl:
       success: "Skupina %{name} je ustvarjena"
     destroy: 
       success: "%{name} je uspešno odstranjen."
-    edit_aspect_pane: 
-      add_existing: "Dodaj obstoječi stik"
-      confirm_remove_aspect: "Ste prepričani, da želite izbrisati skupino?"
-      remove_aspect: "Izbriši skupino"
-      rename_aspect: "Rename aspect"
+    edit: 
+      add_existing: "Dodaj obstoječ kontakt"
+      confirm_remove_aspect: "Ste prepričani, da bi radi izbrisali ta vidik?"
+      remove_aspect: "Izbriši ta vidik"
+      rename_aspect: "Preimenuj vidik"
     helper: 
       are_you_sure: "Ste prepričani, da želite izbrisati skupino?"
       aspect_not_empty: "Skupina vsebuje stike"
       remove: "odstrani"
     index: 
       handle_explanation: "To je vaš diaspora naslov. Tako kot vaš e-naslov, ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
+      no_contacts: "Ni kontaktov"
     manage: 
       add_a_new_aspect: "Dodaj novo skupino"
       add_a_new_contact: "Dodaj nov stik"
-      drag_to_add: "Za dodajanje osebo povleci"
+      drag_to_add: "Za dodajanje osebe povleci"
       manage_aspects: "Uredi skupine"
       no_requests: "Ni novih prošenj"
       requests: "Prošnje"
@@ -89,7 +89,7 @@ sl:
       nobody: "Povabite v Diasporo vse, ki vam v življenju nekaj pomenijo!"
       nobody_in_aspect: "Vaša skupina '%{aspect_name}' je prazna."
     no_posts_message: 
-      start_talking: "Na to temo je zaenkrat še vse tiho. Bodite prvi in začnite pogovor!"
+      start_talking: "Trenutno še brez objav. Začnite s prvo objavo!"
     remove_from_aspect: 
       failure: "Odstranitev osebe iz skupine ni uspelo"
       success: "Odstranitev osebe iz skupine je uspešno"
@@ -178,7 +178,7 @@ sl:
   next: "naslednja"
   no_new_notifications: "ni novih sporočil"
   notifications: 
-    also_commented: "also commented on"
+    also_commented: "komentirano tudi na"
     comment_on_post: "komentar na vaš"
     deleted: "izbrisano"
     index: 
@@ -188,13 +188,13 @@ sl:
     request_accepted: "vaše prošnja je sprejeta."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has also commented."
+      commented: "prav tako komentirano na objavo osebe %{post_author}:"
+      sign_in: "Za ogled se prijavite."
+      subject: "oseba %{name} je prav tako komentirala."
     comment_on_post: 
-      commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      commented: "komentar na vašo objavo!"
+      sign_in: "Za ogled se prijavite."
+      subject: "Oseba %{name} je komentirala vašo objavo."
     diaspora: "diaspora email robot"
     hello: "Pozdravljeni %{name}!"
     love: "vas pozdravlja,"
@@ -361,7 +361,7 @@ sl:
       create_request: "Poišči po Diaspora imenu"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Vpišite Diaspora uporabniško ime:"
-      know_email: "Ali veste njihove naslove e-pošte? Povabite jih"
+      know_email: "Ali poznate njihove naslove e-naslove? Povabite jih"
       your_diaspora_username_is: "Vaše Diaspora uporabniško ime je: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Vsi stiki"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 3057df00b62fabc5857c3ada843d7b419e5ec97e..6a89ceea548fbea4726b98e37126add7ab4045fb 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -4,7 +4,11 @@
 
 
 sv: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Kommentarer"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Hem"
   _photos: "foton"
   _services: "Tjänster"
@@ -45,11 +49,6 @@ sv:
     add_to_aspect: 
       failure: "Personen kunde inte läggas till på sidan."
       success: "Personen tillagd på sidan."
-    all_aspects_contacts: 
-      all_contacts: "Alla kontakter"
-      aspects: "Sidor"
-      manage_aspects: "hantera sidor"
-      no_contacts: "Förnärvarande har du inga kontakter. Hitta dina kontakter här."
     aspect_contacts: 
       done_editing: "dölj"
     create: 
@@ -57,10 +56,10 @@ sv:
       success: "Din nya sida %{name} har skapats"
     destroy: 
       success: "%{name} är nu borttagen."
-    edit_aspect_pane: 
-      add_existing: "Lägg till en befintlig kontakt"
-      confirm_remove_aspect: "Är du säker på att du vill tabort denna sida?"
-      remove_aspect: "Ta bort denna sida"
+    edit: 
+      add_existing: "Add an existing contact"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Är du säker på att du vill tabort den här sidan?"
@@ -68,6 +67,7 @@ sv:
       remove: "ta bort"
     index: 
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Lägg till en ny sida"
       add_a_new_contact: "Lägg till en ny kontakt"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index e6cc8fdbf5b1277a89d969af0d47b39f64799ebd..ab9914cc579b752628a902662e8388b071cfa3d8 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -4,7 +4,11 @@
 
 
 tr: 
+  _aspect: "Aspect"
+  _aspects: "Aspects"
   _comments: "Comments"
+  _contact: "Contact"
+  _contacts: "Contacts"
   _home: "Home"
   _photos: "fotoÄŸraflar"
   _services: "Servisler"
@@ -45,11 +49,6 @@ tr:
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
-    all_aspects_contacts: 
-      all_contacts: "All contacts"
-      aspects: "Aspects"
-      manage_aspects: "manage aspects"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
     aspect_contacts: 
       done_editing: "done editing"
     create: 
@@ -57,10 +56,10 @@ tr:
       success: "Sol taraftaki arti ya tıklıyarak Diasporaya sizin yeni yanınızı kimlerin görebileceğini belirtin."
     destroy: 
       success: "%{name} başarıyla yaratıldı."
-    edit_aspect_pane: 
+    edit: 
       add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
+      remove_aspect: "Delete this aspect"
       rename_aspect: "Rename aspect"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
@@ -68,6 +67,7 @@ tr:
       remove: "çıkar"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Yeni bir yan ekle"
       add_a_new_contact: "Yeni kiÅŸi ekleyin"
diff --git a/config/locales/rails-i18n/cy.yml b/config/locales/rails-i18n/cy.yml
new file mode 100644
index 0000000000000000000000000000000000000000..11a58819223d867509c5bd82055956c957001efc
--- /dev/null
+++ b/config/locales/rails-i18n/cy.yml
@@ -0,0 +1,181 @@
+# Welsh translations for Ruby on Rails
+# by Aran Jones (aranjones@gmail.com)
+
+cy:
+  date:
+    formats:
+      default: "%d-%m-%Y"
+      short: "%b %d"
+      long: "%B %d, %Y"
+
+    day_names: [Dydd Sul, Dydd Llun, Dydd Mawrth, Dydd Mercher, Dydd Iau, Dydd Gwener, Dydd Sadwrn]
+    abbr_day_names: [Sul, Llun, Maw, Mer, Iau, Gwe, Sad]
+
+    month_names: [~, mis Ionawr, mis Chwefror, mis Mawrth, mis Ebrill, mis Mai, mis Mehefin, mis Gorffennaf, mis Awst, mis Medi, mis Hydref, mis Tachwedd, mis Rhagfyr]
+    abbr_month_names: [~, Ion, Chw, Maw, Ebr, Mai, Meh, Gor, Awst, Med, Hyd, Tach, Rha]
+    order:
+      - :year
+      - :month
+      - :day
+
+  time:
+    formats:
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      short: "%d %b %H:%M"
+      long: "%B %d, %Y %H:%M"
+    am: "yb"
+    pm: "yh"
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " a "
+      last_word_connector: ", a "
+
+    select:
+      prompt: "Dewiswch"
+
+  number:
+    format:
+      separator: "."
+      delimiter: ","
+      precision: 3
+      significant: false
+      strip_insignificant_zeros: false
+
+    currency:
+      format:
+        format: "%u%n"
+        unit: "£"
+        separator: "."
+        delimiter: ","
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+
+    percentage:
+      format:
+        delimiter: ""
+
+    precision:
+      format:
+        delimiter: ""
+
+    human:
+      format:
+        delimiter: ""
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: Mil
+          million: Miliwn
+          billion: Biliwn
+          trillion: Triliwn
+          quadrillion: Cwadriliwn
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "hanner munud"
+      less_than_x_seconds:
+        one:   "llai nag eiliad"
+        other: "llai na %{count} eiliad"
+      x_seconds:
+        one:   "1 eiliad"
+        other: "%{count} o eiliadau"
+      less_than_x_minutes:
+        one:   "llai na munud"
+        other: "llai na %{count} munud"
+      x_minutes:
+        one:   "1 munud"
+        other: "%{count} o funudau"
+      about_x_hours:
+        one:   "tuag awr"
+        other: "tua %{count} awr"
+      x_days:
+        one:   "1 diwrnod"
+        other: "%{count} diwrnod"
+      about_x_months:
+        one:   "tua mis"
+        other: "tua %{count} mis"
+      x_months:
+        one:   "1 mis"
+        other: "%{count} mis"
+      about_x_years:
+        one:   "tua blwyddyn"
+        other: "tua %{count} blynedd"
+      over_x_years:
+        one:   "dros flwyddyn"
+        other: "dros %{count} blynedd"
+      almost_x_years:
+        one:   "bron yn flwyddyn"
+        other: "bron yn %{count} blynedd"
+    prompts:
+      year:   "Blwyddyn"
+      month:  "Mis"
+      day:    "Diwrnod"
+      hour:   "Awr"
+      minute: "Munud"
+      second: "Eiliad"
+
+  helpers:
+    select:
+      prompt: "Dewiswch"
+
+    submit:
+      create: 'Creu %{model}'
+      update: 'Diweddaru %{model}'
+      submit: 'Cadw %{model}'
+
+  errors:
+    format: "%{attribute} %{message}"
+
+    messages: &errors_messages
+      inclusion: "heb fod yn y rhestr"
+      exclusion: "wedi cadw"
+      invalid: "heb fod yn nheilwng"
+      confirmation: "heb fod yn gyfateb"
+      accepted: "angen ei dderbyn"
+      empty: "methu bod yn wag"
+      blank: "methu bod yn wag"
+      too_long: "yn rhy hir (cewch %{count} llythyren ar y fwyaf)"
+      too_short: "yn rhy fyr (rhaid am o leiaf %{count} llythyren)"
+      wrong_length: "gyda maint anghywir o lythrennau (dylai fod yn %{count} llythyren)"
+      not_a_number: "heb fod yn rhif"
+      not_an_integer: "heb fod yn rhif llawn"
+      greater_than: "angen bod yn fwy na %{count}"
+      greater_than_or_equal_to: "angen bod yr un maint neu fwy na %{count}"
+      equal_to: "angen bod yn %{count}"
+      less_than: "angen bod yn llai na %{count}"
+      less_than_or_equal_to: "angen bod yr un maint neu lai na %{count}"
+      odd: "rhaid bod yn odrif"
+      even: "rhaid bod yn eilrif"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "Atalwyd y %{model} hwn rhag ei gadw gan 1 nam"
+          other:  "Atalwyd y %{model} hwn rhag ei gadw gan %{count} nam"
+        body: "Cafwyd broblemau gyda'r meysydd canlynol:"
+
+      messages:
+        taken: "wedi'i gymryd yn barod"
+        record_invalid: "Gwirio wedi methu: %{errors}"
+        <<: *errors_messages
+
+      full_messages:
+        format: "%{attribute}%{message}"
diff --git a/config/locales/rails-i18n/fr.yml b/config/locales/rails-i18n/fr.yml
index 2cab33f99d80b8d7cb0554d614fe89780d52aeea..407922695a9593726741255d2424cf1ca39443c3 100644
--- a/config/locales/rails-i18n/fr.yml
+++ b/config/locales/rails-i18n/fr.yml
@@ -135,13 +135,6 @@ fr:
       update: "Modifier ce %{model}"
       submit: "Enregistrer ce %{model}"
 
-  errors:
-    template: &errors_template
-      header:
-        one:   "Impossible d'enregistrer ce %{model} : 1 erreur"
-        other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
-      body: "Veuillez vérifier les champs suivants : "
-
   attributes:
     created_at: "Créé le"
     updated_at: "Modifié le"
@@ -168,6 +161,11 @@ fr:
       less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
       odd: "doit être impair"
       even: "doit être pair"
+    template: &errors_template
+      header:
+        one:   "Impossible d'enregistrer ce %{model} : 1 erreur"
+        other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
+      body: "Veuillez vérifier les champs suivants : "
 
   activerecord:
     errors: