diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 1f3b3a4cf..164489a86 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -6,7 +6,7 @@
 fr: 
   devise: 
     confirmations: 
-      confirmed: "Votre compte a été confirmé avec succès. Vous êtes à présent connecté."
+      confirmed: "Votre compte a été confirmé. Vous êtes à présent connecté(e)."
       new: 
         resend_confirmation: "Renvoyer les instructions de confirmation"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour confirmer votre compte."
@@ -21,7 +21,7 @@ fr:
     invitations: 
       invitation_token_invalid: "Le jeton d’invitation fourni n’est pas valide !"
       send_instructions: "Votre invitation a été envoyée."
-      updated: "Votre mot de passe a été créé avec succès. Vous êtes à présent connecté."
+      updated: "Votre mot de passe a été créé. Vous êtes à présent connecté(e)."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmer mon compte"
@@ -57,11 +57,11 @@ fr:
         no_account: "Aucun compte n'est associé à cette adresse de courrier électronique. Si vous attendez une invitation, nous les distribuons aussi vite que possible."
         send_password_instructions: "Envoyez-moi les instructions de réinitialisation de mot de passe"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour réinitialiser votre mot de passe."
-      updated: "Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté."
+      updated: "Votre mot de passe a été modifié. Vous êtes à présent connecté(e)."
     registrations: 
-      destroyed: "Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt."
-      signed_up: "Vous vous êtes inscrit avec succès. Si cette dernière est activée, une confirmation a été envoyée sur votre adresse e-mail."
-      updated: "Vous avez mis à jour votre compte avec succès."
+      destroyed: "Au revoir ! Votre compte a été résilié. Nous espérons vous revoir très bientôt."
+      signed_up: "Votre inscription a été effectuée. Si cette dernière est activée, une confirmation a été envoyée sur votre adresse e-mail."
+      updated: "Vous avez mis à jour votre compte."
     sessions: 
       new: 
         alpha_software: "Vous êtes sur le point d'utiliser une application en version alpha."
@@ -73,8 +73,8 @@ fr:
         remember_me: "Se souvenir de moi"
         sign_in: "Connexion"
         username: "Nom d'utilisateur"
-      signed_in: "Connecté avec succès."
-      signed_out: "Déconnecté avec succès."
+      signed_in: "Vous êtes à présent connecté(e)."
+      signed_out: "Vous êtes à présent déconnecté(e)."
     shared: 
       links: 
         forgot_your_password: "Mot de passe oublié ?"
@@ -89,7 +89,7 @@ fr:
       new: 
         resend_unlock: "Renvoyer les instructions de déblocage"
       send_instructions: "Vous allez recevoir dans quelques minutes un e-mail contenant les instructions pour déverrouiller votre compte."
-      unlocked: "Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté."
+      unlocked: "Votre compte a été déverrouillé. Vous êtes à présent connecté(e)."
   errors: 
     messages: 
       already_confirmed: "a déjà été confirmé"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 007b4209a..44c6d7d60 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -244,6 +244,8 @@ ar:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 0fcfa1f7b..76e6c0dfc 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -4,7 +4,7 @@
 
 
 cs: 
-  _comments: "Comments"
+  _comments: "Komentáře"
   _home: "Doma"
   _photos: "fotky"
   _services: "Služby"
@@ -244,6 +244,8 @@ cs:
         other: "%{count} nových oznámení"
         zero: "žádná nová oznámení"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
     mentioned: "vás zmínil v jejich"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 85b55fe91..7428cb94d 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -244,6 +244,8 @@ cy:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index adcdd36c0..504b656c6 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -244,6 +244,8 @@ da:
         other: "%{count} nye notifikationer"
         zero: "ingen nye notifikationer"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marker alle som læst"
       notifications: "Notifikationer"
     mentioned: "har omtalt dig i deres"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 3aee2d8c2..3134e793e 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -205,7 +205,7 @@ de:
       already_invited: "Bereits eingeladen"
       aspect: "Aspekt"
       comma_seperated_plz: "Du kannst mehrere E-Mail-Adressen eintragen. Trenne sie mit Kommata."
-      if_they_accept_info: "wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den Du sie eingeladen hast."
+      if_they_accept_info: "Wenn sie akzeptieren, werden sie zu dem Aspekt hinzugefügt, in den du sie eingeladen hast."
       invite_someone_to_join: "Lade jemanden zu Diaspora* ein!"
       personal_message: "Persönliche Nachricht"
       resend: "Erneut senden"
@@ -244,6 +244,8 @@ de:
         other: "%{count} neue Benachrichtigungen"
         zero: "keine neuen Benachrichtigungen"
     index: 
+      and: "und"
+      and_others: "und %{number} andere"
       mark_all_as_read: "Markiere alle als gelesen"
       notifications: "Benachrichtigungen"
     mentioned: "hat dich erwähnt in "
@@ -318,7 +320,7 @@ de:
       incoming_request: "Du hast eine eingehende Anfrage von dieser Person."
       message: "Nachricht"
       no_posts: "Keine Beiträge zum Anzeigen!"
-      not_connected: "Du teilst nicht mit %{name}"
+      not_connected: "Du teilst nicht mit dieser Person"
       recent_posts: "Neueste Beiträge"
       recent_public_posts: "Neueste öffentliche Beiträge"
       return_to_aspects: "Kehre zur Aspekt-Übersicht zurück."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 7b6a7d752..a7e069f84 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -66,15 +66,15 @@ el:
       success: "Ο χρήστης %{name} αφαιρέθηκε επιτυχώς."
     edit: 
       add_existing: "Προσθέστε μια υπάρχουσα επαφή"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "η λίστα σας είναι κρυφή στους άλλους στην πτυχή"
+      aspect_list_is_visible: "η λίστα σας είναι ορατή στους άλλους στην πτυχή"
       confirm_remove_aspect: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
-      done: "Done"
-      make_aspect_list_visible: "ορίστε τη λίστα πτυχών σας ορατή σε όλους στη πτυχή "
+      done: "Ολοκληρώθηκε"
+      make_aspect_list_visible: "θέλετε να ορίσετε τη λίστα των πτυχών σας ορατή;"
       remove_aspect: "Διαγραφή αυτής της πτυχής"
       rename: "μετονομασία"
-      update: "update"
-    few: "%{count} aspects"
+      update: "ενημέρωση"
+    few: "%{count} πτυχές"
     helper: 
       are_you_sure: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
@@ -89,7 +89,7 @@ el:
       manage_aspects: "Διαχείρηση πτυχών"
       no_requests: "Κανένα νέο αίτημα"
       requests: "Αιτήματα"
-    many: "%{count} aspects"
+    many: "%{count} πτυχές"
     move_contact: 
       error: "Σφάλμα μεταφοράς επαφής: %{inspect}"
       failure: "δεν λειτούργησε %{inspect}"
@@ -105,8 +105,8 @@ el:
       nobody_in_aspect: "Η πτυχή σας '%{aspect_name}' είναι κενή."
     no_posts_message: 
       start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα. Ξεκινήστε εσείς τη συζήτηση!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 πτυχή"
+    other: "%{count} πτυχές"
     seed: 
       family: "Οικογένεια"
       work: "Εργασία"
@@ -115,18 +115,18 @@ el:
     update: 
       failure: "Η πτυχή σας, %{name}, έχει πολύ μεγάλο όνομα για να αποθηκευτεί."
       success: "Έγινε επιτυχώς η επεξεργασία της πτυχής σας,% {name}."
-    zero: "no aspects"
+    zero: "καμία πτυχή"
   back: "Πίσω"
   cancel: "Ακύρωση"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} σχόλια"
+    many: "%{count} σχόλια"
     new_comment: 
       comment: "Σχολιάστε"
       commenting: "Σχολιάζει..."
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "1 σχόλιο"
+    other: "%{count} σχόλια"
+    zero: "κανένα σχόλιο"
   contacts: 
     create: 
       failure: "Αποτυχία δημιουργίας επαφής"
@@ -134,7 +134,7 @@ el:
       failure: "Αποτυχία αποσύνδεσης από τον/την %{name}"
       success: "Επιτυχία αποσύνδεσης από τον/την %{name}"
     few: "%{count} επαφές"
-    many: "%{count} contacts"
+    many: "%{count} επαφές"
     one: "1 επαφή"
     other: "%{count} επαφές"
     share_with_pane: 
@@ -145,25 +145,25 @@ el:
   conversations: 
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} νέα μηνύματα"
+        many: "%{count} νέα μηνύματα"
+        one: "1 νέο μήνυμα"
+        other: "%{count} νέα μηνύματα"
+        zero: "κανένα νέο μήνυμα"
     index: 
-      create_a_new_message: "create a new message"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "δημιουργία νέου μηνύματος"
+      message_inbox: "Εισερχόμενα"
+      new_message: "Νέο Μήνυμα"
+      no_conversation_selected: "δεν επιλέχτηκε συζήτηση"
+      no_messages: "κανένα μήνυμα"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "Δεν βρέθηκαν αποτελέσματα"
+      send: "Αποστολή"
+      subject: "θέμα"
+      to: "στον"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "διαγραφή και φραγή συζήτησης"
+      reply: "απάντηση"
   date: 
     formats: 
       birthday: "%B %d"
@@ -217,7 +217,7 @@ el:
       have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ"
       logged_in_as: "σύνδεση ως %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Δημόσια ανατροφοδότηση (feed) του Diaspora για τον χρήστη %{name}"
       toggle: "εναλλαγή ιστοσελίδας κινητού"
       whats_new: "Τι νέα?"
       your_aspects: "οι πτυχές σας"
@@ -238,12 +238,14 @@ el:
     deleted: "διαγράφηκε"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} νέες ειδοποιήσεις"
+        many: "%{count} νέες ειδοποιήσεις"
+        one: "1 νέα ειδοποίηση"
+        other: "%{count} νέες ειδοποιήσεις"
+        zero: "καμία νέα ειδοποίηση"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
     mentioned: "σας ανέφερε στο"
@@ -259,9 +261,9 @@ el:
       commented: "έχει σχολιάσει σε δημοσίευση σας:"
       sign_in: "Συνδεθείτε για να το δείτε."
       subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας."
-    diaspora: "ρομπότ για τα email του δικτύου Diaspora"
+    diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.."
     hello: "Γειά σου %{name}!"
-    love: "αγάπη,"
+    love: "Με αγάπη,"
     mentioned: 
       mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
       sign_in: "Συνδεθείτε για να το δείτε."
@@ -272,10 +274,10 @@ el:
       subject: "έχετε νέο αίτημα επαφής Diaspora από τον χρήστη %{from}"
       try_it_out: "Θα πρέπει πραγματικά να σκεφτείτε να το ελέγξετε."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      message_subject: "Θέμα: %{subject}"
+      private_message: "σας έστειλε ένα ιδιωτικό μήνυμα:"
+      sign_in: "Συνδεθείτε για να το δείτε."
+      subject: "Ο χρήστης %{name} σας έστειλε ένα ιδιωτικό μήνυμα στο Diaspora*"
     request_accepted: 
       accepted: "έχει αποδεχθεί το αίτημα φιλίας σας!"
       sign_in: "Συνδεθείτε εδώ"
@@ -316,7 +318,7 @@ el:
     show: 
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
-      message: "Message"
+      message: "Μήνυμα"
       no_posts: "κανένα μήνυμα προς εμφάνιση!"
       not_connected: "Δεν είστε συνδεδεμένος με τον χρήστη %{name}"
       recent_posts: "Πρόσφατες δημοσιεύσεις"
@@ -364,8 +366,8 @@ el:
       notice: "Η φωτογραφία ενημερώθηκε επιτυχώς."
   posts: 
     index: 
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      whatup: "What's happening on %{pod}"
+      posts_tagged_with: "Δημοσιεύσεις με την ετικέτα #%{tag}"
+      whatup: "Τι συμβαίνει στο %{pod}"
   previous: "προηγούμενο"
   profile: "Προφίλ"
   profiles: 
@@ -413,11 +415,11 @@ el:
       success: "Είστε πλέον φίλοι."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} νέα αιτήματα!"
+        many: "%{count} νέα αιτήματα!"
+        one: "νέο αίτημα!"
+        other: "%{count} νέα αιτήματα!"
+        zero: "κανένα νέο αίτημα"
     manage_aspect_contacts: 
       existing: "Υφιστάμενες επαφές"
       manage_within: "Διαχειριστείτε τις επαφές της πτυχής"
@@ -434,7 +436,7 @@ el:
     finder: 
       friends: 
         few: "%{count} φίλοι"
-        many: "%{count} friends"
+        many: "%{count} φίλοι"
         one: "1 φίλος"
         other: "%{count} φίλοι"
         zero: "κανένας φίλος"
@@ -448,7 +450,7 @@ el:
       logged_in_as: "συνδεδεμένο ως"
       really_disconnect: "αποσύνδεση %{service};"
     inviter: 
-      click_link_to_accept_invitation: "Κάντε κλικ αυτό το σύνδεσμο για να αποδεχθείτε την πρόσκλησή σας"
+      click_link_to_accept_invitation: "Κάντε κλικ σ' αυτό το σύνδεσμο για να αποδεχθείτε την πρόσκλησή σας"
       join_me_on_diaspora: "Συνδεθείτε μαζί μου στο DIASPORA*"
     remote_friend: 
       invite: "πρόσκληση"
@@ -486,7 +488,7 @@ el:
       all_contacts: "όλες οι επαφές"
       make_public: "Δημοσιοποίησε το"
       mention_helper_text: "για ν' αναφέρεις κάποιον, πάτα '@' και άρχισε να πληκτρολογείς το όνομα του"
-      post_a_message_to: "Αναρτήστε ένα μήνυμα στο %{aspect}"
+      post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
       share: "Μοιράσου"
       share_with: "Μοιράσου με"
@@ -512,7 +514,7 @@ el:
   users: 
     destroy: "Ο λογαριασμός έκλεισε με επιτυχία."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...κάποιος επίσης σχολίασε σε δημοσίευση επαφής σας;"
       change: "Αλλαγή"
       change_language: "Αλλαγή Γλώσσας"
       change_password: "Αλλαγή κωδικού πρόσβασης"
@@ -526,7 +528,7 @@ el:
       mentioned: "...επισημανθήκατε σε μία φωτογραφία?"
       new_password: "Νέος κωδικός πρόσβασης"
       private_message: "...μόλις λάβατε μία προσωπική ειδοποίηση?"
-      receive_email_notifications: "Να λαμβάνετε ειδοποιήσεις στο ηλεκτρονικό σας ταχυδρομείο; "
+      receive_email_notifications: "Να λαμβάνετε ειδοποιήσεις στο ηλεκτρονικό σας ταχυδρομείο όταν..."
       request_acceptence: "...το αίτημα σας για διαμοιρασμό έγινε αποδεκτό?"
       request_received: "...μόλις λάβατε ένα καινούριο αίτημα για διαμοιρασμό?"
       your_email: "Το email σας"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index e411ba399..0ac565a79 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -66,14 +66,14 @@ en_shaw:
       success: "%{name} 𐑢𐑪𐑟 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑮𐑦𐑥𐑵𐑝𐑛."
     edit: 
       add_existing: "𐑨𐑛 𐑩𐑯 𐑧𐑜𐑟𐑦𐑕𐑑𐑦𐑙 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑦𐑟 𐑣𐑦𐑛𐑩𐑯 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
+      aspect_list_is_visible: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑦𐑟 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
       confirm_remove_aspect: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
-      done: "Done"
+      done: "𐑛𐑳𐑯"
       make_aspect_list_visible: "𐑥𐑱𐑒 𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
       remove_aspect: "𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑"
       rename: "𐑮𐑦𐑯𐑱𐑥"
-      update: "update"
+      update: "𐑳𐑐𐑛𐑱𐑑"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
@@ -106,7 +106,7 @@ en_shaw:
     no_posts_message: 
       start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
     one: "1 aspect"
-    other: "%{count} aspects"
+    other: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     seed: 
       family: "𐑓𐑨𐑥𐑦𐑤𐑦"
       work: "𐑢𐑻𐑒"
@@ -115,7 +115,7 @@ en_shaw:
     update: 
       failure: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑, %{name}, 𐑣𐑨𐑛 𐑑𐑵 𐑤𐑪𐑙 𐑩 𐑯𐑱𐑥 𐑑 𐑚𐑰 𐑕𐑱𐑝𐑛."
       success: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑, %{name}, 𐑣𐑨𐑟 𐑚𐑧𐑯 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑧𐑛𐑦𐑑𐑩𐑛."
-    zero: "no aspects"
+    zero: "𐑯𐑴 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
   back: "𐑚𐑨𐑒"
   cancel: "𐑒𐑨𐑯𐑕𐑩𐑤"
   comments: 
@@ -134,7 +134,7 @@ en_shaw:
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑 𐑓𐑮𐑪𐑥 %{name}"
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑓𐑮𐑪𐑥 %{name}"
     few: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-    many: "%{count} contacts"
+    many: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     share_with_pane: 
@@ -151,19 +151,19 @@ en_shaw:
         other: "%{count} new messages"
         zero: "no new messages"
     index: 
-      create_a_new_message: "create a new message"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑯𐑿 𐑥𐑧𐑕𐑩𐑡"
+      message_inbox: "𐑥𐑧𐑕𐑩𐑡 𐑦𐑯𐑚𐑪𐑒𐑕"
+      new_message: "𐑯𐑿 𐑥𐑧𐑕𐑩𐑡"
+      no_conversation_selected: "𐑯𐑴 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑩𐑤𐑧𐑒𐑑𐑩𐑛"
+      no_messages: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡𐑩𐑟"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛"
+      send: "𐑕𐑧𐑯𐑛"
+      subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑"
+      to: "𐑑"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "𐑛𐑦𐑤𐑰𐑑 𐑯 𐑚𐑤𐑪𐑒 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯"
+      reply: "𐑮𐑦𐑐𐑤𐑲"
   date: 
     formats: 
       birthday: "%B %d"
@@ -217,7 +217,7 @@ en_shaw:
       have_a_problem: "𐑣𐑨𐑝 𐑩 𐑐𐑮𐑪𐑚𐑤𐑩𐑥, 𐑓𐑲𐑯𐑛 𐑩𐑯 𐑨𐑯𐑕𐑼 𐑣𐑽"
       logged_in_as: "𐑤𐑪𐑜𐑛 𐑦𐑯 𐑨𐑟 %{name}"
       powered_by: "𐑐𐑬𐑮𐑛 𐑚𐑲 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "𐑐𐑳𐑚𐑤𐑦𐑒 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑓𐑰𐑛 𐑓𐑹 %{name}"
       toggle: "𐑑𐑪𐑜𐑩𐑤 𐑥𐑴𐑚𐑩𐑤 𐑕𐑲𐑑"
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑒𐑐𐑧𐑒𐑑𐑕"
@@ -238,12 +238,14 @@ en_shaw:
     deleted: "𐑛𐑦𐑤𐑰𐑑𐑩𐑛"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
+        many: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
+        one: "1 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯"
+        other: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
+        zero: "𐑯𐑴 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑞𐑺"
@@ -272,9 +274,9 @@ en_shaw:
       subject: "𐑯𐑿 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩* 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑓𐑮𐑪𐑥 %{from}"
       try_it_out: "𐑿 𐑖𐑫𐑛 𐑮𐑦𐑤𐑦 𐑔𐑦𐑙𐑒 𐑩𐑚𐑬𐑑 𐑗𐑧𐑒𐑦𐑙 𐑦𐑑 𐑬𐑑."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
+      message_subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑: %{subject}"
+      private_message: "𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡:"
+      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
       subject: "%{name} has sent you a private message yon Diaspora*"
     request_accepted: 
       accepted: "𐑣𐑨𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑!"
@@ -316,7 +318,7 @@ en_shaw:
     show: 
       does_not_exist: "𐑐𐑻𐑕𐑩𐑯 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
       incoming_request: "%{name} 𐑢𐑳𐑯𐑑𐑕 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿"
-      message: "Message"
+      message: "𐑥𐑧𐑕𐑩𐑡"
       no_posts: "𐑯𐑴 𐑐𐑴𐑕𐑑𐑕 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱!"
       not_connected: "𐑿 𐑸 𐑯𐑪𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 %{name}"
       recent_posts: "𐑮𐑰𐑕𐑩𐑯𐑑 𐑐𐑴𐑕𐑑𐑕"
@@ -434,7 +436,7 @@ en_shaw:
     finder: 
       friends: 
         few: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
-        many: "%{count} friends"
+        many: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
         one: "1 𐑓𐑮𐑧𐑯𐑛"
         other: "%{count} 𐑓𐑮𐑧𐑯𐑛𐑟"
         zero: "𐑯𐑴 𐑓𐑮𐑧𐑯𐑛𐑟"
@@ -512,23 +514,23 @@ en_shaw:
   users: 
     destroy: "𐑩𐑒𐑬𐑯𐑑 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑒𐑤𐑴𐑟𐑛."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕 𐑐𐑴𐑕𐑑?"
       change: "𐑗𐑱𐑯𐑡"
       change_language: "𐑗𐑱𐑯𐑡 𐑤𐑱𐑙𐑜𐑢𐑩𐑡"
       change_password: "𐑗𐑱𐑯𐑡 𐑐𐑨𐑕𐑢𐑼𐑛"
       close_account: "𐑒𐑤𐑴𐑟 𐑩𐑒𐑬𐑯𐑑"
-      comment_on_post: "...someone comments on your post?"
+      comment_on_post: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑒𐑪𐑥𐑩𐑯𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       current_password: "𐑒𐑻𐑩𐑯𐑑 𐑐𐑨𐑕𐑢𐑼𐑛"
       download_photos: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑓𐑴𐑑𐑴𐑟"
       download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤."
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
-      private_message: "...you receive a private message?"
+      private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      request_acceptence: "...𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑦𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛?"
+      request_received: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑯𐑿 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
     getting_started: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 458fe1907..75fef4b2e 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -244,6 +244,8 @@ eo:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index ebd90be03..0f14e0523 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -244,6 +244,8 @@ es-CL:
         other: "%{count} nuevas notificaciones"
         zero: "sin nuevas notificaciones"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
     mentioned: "te mencionó en su"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 76e133860..e477e662d 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -244,6 +244,8 @@ es:
         other: "%{count} nuevas notificaciones"
         zero: "no hay notificaciones"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marcar todo como leído"
       notifications: "Notificaciones"
     mentioned: "te nombró en su"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 837d5c049..fdd8dbde1 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -244,6 +244,8 @@ eu:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
     mentioned: "aipatu zaituzte bere"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 7b19cb1f0..8a158bcb3 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -244,6 +244,8 @@ fi:
         other: "%{count} uutta ilmoitusta"
         zero: "ei uusia ilmoituksia"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Merkitse kaikki luetuiksi"
       notifications: "Ilmoitukset"
     mentioned: "on maininnut sinut heidän"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 46d903d9a..46f059bd2 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -49,7 +49,7 @@ fr:
   aspects: 
     add_to_aspect: 
       failure: "L’ajout du contact à l’aspect a échoué."
-      success: "Vous avez ajouté le contact à l’aspect avec succès."
+      success: "Le contact a été ajouté à l’aspect."
     aspect_contacts: 
       done_editing: "fin de la modification"
     aspect_stream: 
@@ -63,7 +63,7 @@ fr:
       success: "Votre nouvel aspect %{name} a été créé."
     destroy: 
       failure: "%{name} n'est pas vide et n'a pas pu être supprimé."
-      success: "%{name} a été supprimé avec succès."
+      success: "%{name} a été supprimé."
     edit: 
       add_existing: "Ajouter un contact existant"
       aspect_list_is_not_visible: "la liste d'aspect est masquée pour les autres membres de cet aspect"
@@ -114,7 +114,7 @@ fr:
       edit_aspect: "modifier l'aspect"
     update: 
       failure: "Votre aspect %{name} a un nom trop long pour être enregistré."
-      success: "Votre aspect « %{aspect_name} » a été modifié avec succès."
+      success: "Votre aspect « %{aspect_name} » a été modifié."
     zero: "aucun aspect"
   back: "Retour"
   cancel: "Annuler"
@@ -244,6 +244,8 @@ fr:
         other: "%{count} nouvelles notifications"
         zero: "aucune nouvelle notification"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
     mentioned: "vous a mentionné(e) dans son"
@@ -361,7 +363,7 @@ fr:
       view: "voir"
     update: 
       error: "La modification de la photo a échoué."
-      notice: "La photo a été mise à jour avec succès."
+      notice: "La photo a été mise à jour."
   posts: 
     index: 
       posts_tagged_with: "Publications marquées avec #%{tag}"
@@ -510,7 +512,7 @@ fr:
   the_world: "tout le monde"
   username: "Nom d'utilisateur"
   users: 
-    destroy: "Compte clôturé avec succès."
+    destroy: "Compte clôturé."
     edit: 
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
       change: "Modifier"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 963855104..67157d7d0 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -244,6 +244,8 @@ ga:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Fograí"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index a0beec42e..347b15d82 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -244,6 +244,8 @@ gl:
         other: "%{count} novas notificacións"
         zero: "non hai novas notificacións"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marcar todos como lidos"
       notifications: "Notificacións"
     mentioned: "citoute nos seus"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index ec03b2d10..088565ba1 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -244,6 +244,8 @@ he:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "סימון הכול כלאחר קריאה"
       notifications: "התרעות"
     mentioned: "הזכיר/ה אותך ב־"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index b80954e31..84bde9b30 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -244,6 +244,8 @@ hu:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
     mentioned: "megemlítettek téged a"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index be5bbf507..b93ab0722 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -244,6 +244,8 @@ id:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 699b34d0d..bd18e61cf 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -244,6 +244,8 @@ is:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Merkja allt sem lesið"
       notifications: "Tilkynningar"
     mentioned: "hefur getið þín í þeirra"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 8ddc561ff..ae823e7b7 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -244,6 +244,8 @@ it:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Segna Tutti come Letti"
       notifications: "Notifiche"
     mentioned: "ti ha menzionato nel suo"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 2c9054fa4..460c5c444 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -244,6 +244,8 @@ lt:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 876b53b12..b4807ece3 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -244,6 +244,8 @@ mk:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index e808709f0..ed4a3c2df 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -244,6 +244,8 @@ ml:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "എല്ലാം വായിച്ചതായി അടയാളപ്പെടുത്തുക"
       notifications: "അറിയിപ്പുകള്‍"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 9b84469ec..5acb3abea 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -5,10 +5,10 @@
 
 nb: 
   _comments: "Comments"
-  _home: "Home"
-  _photos: "photos"
-  _services: "Services"
-  account: "Account"
+  _home: "Hjem"
+  _photos: "bilder"
+  _services: "Tjenester"
+  account: "Konto"
   activerecord: 
     errors: 
       models: 
@@ -19,7 +19,7 @@ nb:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "er allerede tatt."
         request: 
           attributes: 
             from_id: 
@@ -27,20 +27,20 @@ nb:
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "er allerede tatt."
             person: 
               invalid: "is invalid."
             username: 
-              taken: "is already taken."
+              taken: "er allerede tatt."
   ago: "%{time} ago"
   application: 
     helper: 
       aspect_badge: 
-        all_aspects: "All aspects"
+        all_aspects: "Alle aspekt"
       unknown_person: "ukjent person"
       video_title: 
-        unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+        unknown: "Ukjent Videotittel"
+  are_you_sure: "Er du sikker?"
   aspect_memberships: 
     destroy: 
       failure: "Failed to remove person from aspect"
@@ -56,8 +56,8 @@ nb:
       activity: "activity"
       post_time: "post time"
       sort_by: "sort by:"
-    contacts_not_visible: "Contacts in this aspect will not be able to see each other."
-    contacts_visible: "Contacts in this aspect will be able to see each other."
+    contacts_not_visible: "Kontakter i dette aspektet vil ikke kunne se hverandre."
+    contacts_visible: "Kontakter i dette aspektet vil kunne se hverandre."
     create: 
       failure: "Greide ikke å opprette aspektet."
       success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
@@ -76,7 +76,7 @@ nb:
       update: "update"
     few: "%{count} aspects"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
+      are_you_sure: "Er du sikker på at du vil slette dette aspektet?"
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "fjern"
     index: 
@@ -84,10 +84,10 @@ nb:
       no_contacts: "No contacts"
     manage: 
       add_a_new_aspect: "Legg til et nytt aspekt"
-      add_a_new_contact: "Add a new contact"
+      add_a_new_contact: "Legg til ny kontakt"
       drag_to_add: "Drag to add people"
       manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
+      no_requests: "Ingen nye forespørsler"
       requests: "Forespørsler"
     many: "%{count} aspects"
     move_contact: 
@@ -96,7 +96,7 @@ nb:
       success: "Person moved to new aspect"
     new_aspect: 
       create: "Opprett"
-      name: "Name"
+      name: "Navn"
     no_contacts_message: 
       add_contact: "Add a contact"
       add_contact_to: "Add someone to %{aspect_name}"
@@ -104,26 +104,26 @@ nb:
       nobody: "We know you know people — bring them to Diaspora!"
       nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
-      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+      start_talking: "Ingen har sagt noe enda. Få samtalen i gang!"
     one: "1 aspect"
     other: "%{count} aspects"
     seed: 
-      family: "Family"
-      work: "Work"
+      family: "Familie"
+      work: "Jobb"
     show: 
-      edit_aspect: "edit aspect"
+      edit_aspect: "endre aspekt"
     update: 
       failure: "Your aspect, %{name}, had too long name to be saved."
       success: "Aspektet ditt, %{name}, har blitt endra."
     zero: "no aspects"
   back: "Back"
-  cancel: "Cancel"
+  cancel: "Avbryt"
   comments: 
     few: "%{count} comments"
     many: "%{count} comments"
     new_comment: 
       comment: "Kommenter"
-      commenting: "Commenting..."
+      commenting: "Kommenterer..."
     one: "1 comment"
     other: "%{count} comments"
     zero: "no comments"
@@ -154,23 +154,23 @@ nb:
       create_a_new_message: "create a new message"
       message_inbox: "Message Inbox"
       new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      no_conversation_selected: "ingen samtaler valgt"
+      no_messages: "ingen meldinger"
     new: 
       no_results: "No Results Found"
       send: "Send"
       subject: "subject"
-      to: "to"
+      to: "til"
     show: 
       delete: "delete and block conversation"
-      reply: "reply"
+      reply: "svar"
   date: 
     formats: 
       birthday: "%B %d"
       birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
-  delete: "Delete"
-  email: "Email"
+  delete: "Slett"
+  email: "Epost"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Rett opp de følgende feilene og prøv igjen."
@@ -179,11 +179,11 @@ nb:
   home: 
     show: 
       already_account: "already have an account?"
-      choice: "Choice"
+      choice: "Valg"
       choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
       learn_about_host: "Learn about how to host your own Diaspora server"
       login_here: "log in here"
-      ownership: "Ownership"
+      ownership: "Eierskap"
       ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
       share_what_you_want: "Share what you want, with whom you want."
       simplicity: "Simplicity"
@@ -195,47 +195,47 @@ nb:
       not_found: "Invitation token not found"
     create: 
       already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
+      already_sent: "Du har allerede invitert denne personen."
+      no_more: "Du har ikke flere invitasjoner."
       rejected: "The following email addresses had problems: "
       sent: "Your invitation has been sent."
     edit: 
       sign_up: "sign_up"
     new: 
-      already_invited: "Already invited"
-      aspect: "Aspect"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
+      already_invited: "Allerede innvitert"
+      aspect: "Aspekt"
+      comma_seperated_plz: "Du kan skrive inn flere epostadresser delt med komma."
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
-      invite_someone_to_join: "Invite someone to join Diaspora!"
-      personal_message: "Personal message"
+      invite_someone_to_join: "Inviter noen til Diaspora!"
+      personal_message: "Personlig melding"
       resend: "Resend"
-      send_an_invitation: "Send an invitation"
-      send_invitation: "Send invitation"
-      to: "To"
+      send_an_invitation: "Send en invitasjon"
+      send_invitation: "Send invitasjon"
+      to: "Til"
   layouts: 
     application: 
       have_a_problem: "Have a problem? Find an answer here"
-      logged_in_as: "logged in as %{name}"
-      powered_by: "POWERED BY DIASPORA*"
+      logged_in_as: "logget inn som %{name}"
+      powered_by: "DREVET AV DIASPORA*"
       public_feed: "Public Diaspora Feed for %{name}"
       toggle: "toggle mobile site"
       whats_new: "what's new?"
-      your_aspects: "your aspects"
+      your_aspects: "dine aspekt"
     header: 
-      account_settings: "account settings"
-      blog: "blog"
+      account_settings: "kontoinstillinger"
+      blog: "blogg"
       code: "code"
-      edit_profile: "edit profile"
+      edit_profile: "rediger profil"
       login: "login"
       logout: "logout"
-      view_profile: "view profile"
-  more: "More"
-  next: "next"
+      view_profile: "se profil"
+  more: "Mer"
+  next: "neste"
   notifications: 
     also_commented: "also commented on"
     also_commented_deleted: "commented on a deleted post"
     comment_on_post: "commented on your"
-    deleted: "deleted"
+    deleted: "slettet"
     helper: 
       new_notifications: 
         few: "%{count} new notifications"
@@ -244,9 +244,11 @@ nb:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
-      mark_all_as_read: "Mark All as Read"
-      notifications: "Notifications"
-    mentioned: "has mentioned you in their"
+      and: "and"
+      and_others: "and %{number} others"
+      mark_all_as_read: "Merk alle som leste"
+      notifications: "Varsler"
+    mentioned: "har nevnt deg i sin"
     new_request: "offered to share with you."
     post: "post"
     request_accepted: "accepted your share request."
@@ -260,7 +262,7 @@ nb:
       sign_in: "Sign in to view it."
       subject: "%{name} has commented on your post."
     diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
+    hello: "Hei %{name}!"
     love: "love,"
     mentioned: 
       mentioned: "mentioned you in a post:"
@@ -285,48 +287,48 @@ nb:
       subject: "A message from your Diaspora administrator:"
     thanks: "Thanks,"
   ok: "OK"
-  or: "or"
-  password: "Password"
-  password_confirmation: "Password confirmation"
+  or: "eller"
+  password: "Passord"
+  password_confirmation: "Passord bekreftelse"
   people: 
     aspect_list: 
       edit_membership: "edit aspect membership"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      results_for: " resultater for %{params}"
     index: 
       couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
-      no_one_found: "...and no one was found."
+      no_one_found: "...og ingen ble funnet."
       no_results: "Hey! You need to search for something."
-      results_for: "search results for"
+      results_for: "søkeresultater for"
     person: 
-      add_contact: "add contact"
+      add_contact: "legg til kontakt"
       already_connected: "Already connected"
       pending_request: "venter på svar"
-      thats_you: "thats you!"
+      thats_you: "det er deg!"
     profile_sidebar: 
       bio: "bio"
       born: "born"
       cannot_remove: "Cannot remove %{name} from last aspect."
-      edit_my_profile: "Edit my profile"
-      gender: "gender"
+      edit_my_profile: "Endre profilen min"
+      gender: "kjønn"
       in_aspects: "in aspects"
-      remove_contact: "remove contact"
-      remove_from: "Remove %{name} from %{aspect}?"
+      remove_contact: "fjern kontakt"
+      remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
-      does_not_exist: "Person does not exist!"
+      does_not_exist: "Personen eksisterer ikke!"
       incoming_request: "You have an incoming request from this person."
       message: "Message"
-      no_posts: "no posts to display!"
+      no_posts: "ingen poster å vise!"
       not_connected: "You are not connected with this person"
       recent_posts: "Recent Posts"
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
-      similar_contacts: "similar contacts"
+      similar_contacts: "lignende kontakter"
       start_sharing: "start sharing"
       to_accept_or_ignore: "to accept or ignore it."
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "Beklager, vi kunne ikke finne %{handle}."
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
@@ -343,7 +345,7 @@ nb:
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      size_error: "{file} er for stor, maks filstørrelse er {sizeLimit}."
     new_profile_photo: 
       or_select_one: "or select one from your already existing"
       upload: "Upload a new profile photo!"
@@ -354,10 +356,10 @@ nb:
       delete_photo: "Slett bilde"
       edit: "edit"
       edit_delete_photo: "Edit photo description / delete photo"
-      make_profile_photo: "make profile photo"
+      make_profile_photo: "gjør til profilbilde"
       original_post: "Original Post"
       permalink: "permalink"
-      update_photo: "Update Photo"
+      update_photo: "Oppdater Bilde"
       view: "view"
     update: 
       error: "Greide ikke å endre bildet."
@@ -366,22 +368,22 @@ nb:
     index: 
       posts_tagged_with: "Posts tagged with #%{tag}"
       whatup: "What's happening on %{pod}"
-  previous: "previous"
-  profile: "Profile"
+  previous: "forrige"
+  profile: "Profil"
   profiles: 
     edit: 
       allow_search: "Allow for people to search for you within Diaspora"
       edit_profile: "Edit profile"
       first_name: "First name"
       info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
+      last_name: "Etternavn"
       update_profile: "Update Profile"
       your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
+      your_birthday: "Din Bursdag"
+      your_gender: "Ditt kjønn"
+      your_name: "Ditt navn"
       your_photo: "Your photo"
-      your_profile: "Your profile"
+      your_profile: "Din profil"
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -391,22 +393,22 @@ nb:
       success: "Du er nå med i Diaspora!"
     edit: 
       cancel_my_account: "Cancel my account"
-      edit: "Edit %{name}"
+      edit: "Endre %{name}"
       leave_blank: "(leave blank if you don't want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
+      password_to_confirm: "(vi trenger ditt nåværende passord for å bekrefte endringene)"
       unhappy: "Unhappy?"
-      update: "Update"
+      update: "Oppdater"
     new: 
       enter_email: "Enter an e-mail"
       enter_password: "Enter a password"
       enter_password_again: "Enter the same password as before"
-      enter_username: "Pick a username (only letters, numbers, and underscores)"
+      enter_username: "Velg et brukernavn (kun bokstaver, nummer og understreker)"
       sign_up: "Registrer deg"
       sign_up_for_diaspora: "Sign up for Diaspora"
   requests: 
     create: 
       sending: "Sending..."
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sent: "Du har bedt om å dele med %{name}.  De burde se det neste gang de logger inn på Diaspora"
     destroy: 
       error: "Velg et aspekt først!"
       ignore: "Ignorerte venneforespørsel"
@@ -422,8 +424,8 @@ nb:
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
     new_request_to_person: 
-      sent: "sent!"
-  search: "Search"
+      sent: "sendt!"
+  search: "Søk"
   services: 
     create: 
       success: "Authentication successful."
@@ -433,64 +435,64 @@ nb:
       error: "there was an error connecting that service"
     finder: 
       friends: 
-        few: "%{count} friends"
+        few: "%{count} venner"
         many: "%{count} friends"
-        one: "1 friend"
-        other: "%{count} friends"
-        zero: "no friends"
-      invite_your_friends_from: "Invite your friends from %{service}"
+        one: "1 venn"
+        other: "%{count} venner"
+        zero: "ingen venner"
+      invite_your_friends_from: "Inviter dine venner fra  %{service}"
       not_connected: "not connected"
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_twitter: "Connect to twitter"
-      disconnect: "disconnect"
+      connect_to_facebook: "Koble til facebook"
+      connect_to_twitter: "Koble til twitter"
+      disconnect: "koble fra"
       edit_services: "Edit services"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
+      logged_in_as: "logget inn som"
+      really_disconnect: "koble fra %{service}?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
+      click_link_to_accept_invitation: "Klikk denne linken for å akseptere invitasjonen din"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
       invite: "invite"
       resend: "resend"
-  settings: "Settings"
+  settings: "Innstillinger"
   shared: 
     add_contact: 
       create_request: "Find by Diaspora handle"
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Kan du epostadressen deres? Inviter dem!"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
     invitations: 
       by_email: "by Email"
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      from_facebook: "From Facebook"
-      invitations_left: "(%{count} left)"
+      dont_have_now: "Du har ingen akkurat nå, men flere invitasjoner kommer snart!"
+      from_facebook: "Fra Facebook"
+      invitations_left: "(%{count} igjen)"
       invite_someone: "Invite someone"
-      invite_your_friends: "Invite your friends"
+      invite_your_friends: "Innviter vennene dine"
       invites: "Invites"
       invites_closed: "Invites are currently closed on this Diaspora seed"
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
-      logged_in: "logged in to %{service}"
+      logged_in: "innlogget på %{service}"
       manage: "manage connected services"
-      outside: "Public messages will be available for others outside of Diaspora to see."
+      outside: "Offentlige meldinger vil være synlige for personer utenfor Diaspora."
       title: "You are about to post a public message!"
     publisher: 
-      add_photos: "add photos"
+      add_photos: "legg til bilder"
       all: "all"
-      all_contacts: "all contacts"
-      make_public: "make public"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      all_contacts: "alle kontakter"
+      make_public: "gjør offentlig"
+      mention_helper_text: "for å nevne noen, skriv '@' og begynn å skriv navnet deres"
       post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
+      posting: "Poster..."
       share: "Del"
       share_with: "Share with %{aspect}"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "Hva tenker du på?"
     reshare: 
       reshare: "Reshare"
   status_messages: 
@@ -508,35 +510,35 @@ nb:
     hide_comments: "hide comments"
     show_comments: "show comments"
   the_world: "the world"
-  username: "Username"
+  username: "Brukernavn"
   users: 
     destroy: "Account successfully closed."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
       change: "Change"
-      change_language: "Change Language"
-      change_password: "Change Password"
-      close_account: "Close Account"
+      change_language: "Endre Språk"
+      change_password: "Endre Passord"
+      close_account: "Steng Konto"
       comment_on_post: "...someone comments on your post?"
-      current_password: "Current password"
+      current_password: "Nåverende passord"
       download_photos: "download my photos"
       download_xml: "download my xml"
-      edit_account: "Edit account"
-      export_data: "Export Data"
+      edit_account: "Endre konto"
+      export_data: "Eksporter Data"
       mentioned: "...you are mentioned in a post?"
-      new_password: "New Password"
+      new_password: "Nytt Passord"
       private_message: "...you receive a private message?"
       receive_email_notifications: "Receive email notificaions?"
       request_acceptence: "...your share request is accepted?"
       request_received: "...you receive a new share request?"
-      your_email: "Your email"
+      your_email: "Din epost"
       your_handle: "Your diaspora handle"
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
-      edit_profile: "Edit your profile"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
+      edit_profile: "Rediger profilen"
+      finished: "Ferdig!"
+      save_and_continue: "Lagre og fortsett"
       signup_steps: "Complete your sign-up by doing these things:"
       skip: "skip getting started"
       step_2: 
@@ -545,15 +547,15 @@ nb:
       step_3: 
         finish: "Finish"
         people_already_on_diaspora: "People already on Diaspora"
-      welcome: "Welcome to Diaspora!"
+      welcome: "Velkommen til Diaspora!"
     public: 
       does_not_exist: "User %{username} does not exist!"
     update: 
       email_notifications_changed: "Language Change Failed"
-      language_changed: "Language Changed"
+      language_changed: "Språk Endret"
       language_not_changed: "Language Change Failed"
-      password_changed: "Password Changed"
-      password_not_changed: "Password Change Failed"
+      password_changed: "Passord Endret"
+      password_not_changed: "Endring av Passord mislyktes"
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 373919807..ef7df2d27 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -244,6 +244,8 @@ nl:
         other: "%{count} nieuwe notificaties"
         zero: "geen nieuwe notificaties"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Markeer alles gelezen"
       notifications: "Notificaties"
     mentioned: "heeft je genoemd in zijn/haar"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 4b8b8c621..1ebd1e925 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -244,6 +244,8 @@ pa:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 2263a5da1..a5e60a72b 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -244,6 +244,8 @@ pl:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Powiadomienia"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 6b8bfc268..225e7f1ac 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -244,6 +244,8 @@ pt-BR:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marcar todas como lido"
       notifications: "Notificações"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index f95509a0d..d205c15dc 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -244,6 +244,8 @@ pt-PT:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 1fbd6d62e..0c3846f67 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -244,6 +244,8 @@ ro:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Marchează-le pe toate ca citite"
       notifications: "Notificări"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 131d884df..09685c306 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -244,6 +244,8 @@ ru:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index ecd7e85c1..cae0047ca 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -244,6 +244,8 @@ sk:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Všetko označiť ako prečítané"
       notifications: "Notifikácie"
     mentioned: "ťa spomenuli v ich"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 8617c8b60..1780c4029 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -244,6 +244,8 @@ sl:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Sporočila"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 6096699d0..27d1dce44 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -244,6 +244,8 @@ sv:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifieringar"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 9b4944b49..21923199f 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -244,6 +244,8 @@ tr:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index ed5681a12..f3c67eb98 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -244,6 +244,8 @@ zh-TW:
         other: "%{count} 個新消息"
         zero: "沒有新消息"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
     mentioned: "提到了你, 在他們的"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index e1e23fc9a..339f48fe0 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -244,6 +244,8 @@ zh:
         other: "%{count} new notifications"
         zero: "no new notifications"
     index: 
+      and: "and"
+      and_others: "and %{number} others"
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     mentioned: "has mentioned you in their"
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 9a86ad145..d872b47a1 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -14,7 +14,7 @@ nl:
       day: "een dag"
       days: "%d dagen"
       hour: "ongeveer een uur"
-      hours: "ongeveer %d uren"
+      hours: "ongeveer %d uur"
       minute: "ongeveer een minuut"
       minutes: "%d minuten"
       month: "ongeveer een maand"