diff --git a/config/locales/devise/devise.eu.yml b/config/locales/devise/devise.eu.yml
index 07139bf16..13c72beb2 100644
--- a/config/locales/devise/devise.eu.yml
+++ b/config/locales/devise/devise.eu.yml
@@ -6,10 +6,10 @@
 eu: 
   devise: 
     confirmations: 
-      confirmed: "Your account was successfully confirmed. You are now signed in."
+      confirmed: "Zure kontua baieztatu da. Sartu egin zara."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+        resend_confirmation: "Berbidali baieztapen argibideak"
+      send_instructions: "Minutu batzuetan kontua baieztatzeko argibideak jasoko dituzu e-postan."
     failure: 
       inactive: "Zure kontua ez da aktibatu oraindik."
       invalid: "E-posta edo pasahitza okerra."
@@ -19,36 +19,36 @@ eu:
       unauthenticated: "Izena eman edo autentikatu behar duzu jarraitu aurretik"
       unconfirmed: "Zure kontua baieztatu behar duzu jarraitu aurretik."
     invitations: 
-      invitation_token_invalid: "The invitation token provided is not valid!"
-      send_instructions: "Your invitation has been sent."
-      updated: "Your password was set successfully. You are now signed in."
+      invitation_token_invalid: "Gonbidapen kodea ez da baliozkoa!"
+      send_instructions: "Gonbidapena bidali duzu."
+      updated: "Zure pasahitza arrakastaz ezarri duzu. Sartu egin zara."
     mailer: 
       confirmation_instructions: 
-        confirm: "Confirm my account"
-        subject: "Confirmation instructions"
-        you_can_confirm: "You can confirm your account through the link below:"
-      hello: "Hello %{email}!"
+        confirm: "Kontua baieztatu"
+        subject: "Baieztapen argibideak"
+        you_can_confirm: "Zure kontua baieztatu dezakezu esteka hau jarraituz:"
+      hello: "Kaixo %{email}!"
       invitation: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Gonbidapena onartu"
+        ignore: "Ez baduzu gonbidapena onartu nahi, gutxietsi mezu hau."
+        no_account_till: "Zure kontua ez da sortua izango goiko esteka jarraitzen duzun arte."
+        subject: "Diasporara gonbidatua izan zara!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
-        has_invited_you: "%{name} has invited you to join Diaspora"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        accept_at: ",%{url}(e)n, onartu dezakezu honako estekaren bidez."
+        has_invited_you: "%{name} Diasporara gonbidatu zaitu"
+        have_invited_you: "%{names} Diasporara gonbidatu zaituzte"
       reset_password_instructions: 
-        change: "Change my password"
-        ignore: "If you didn't request this, please ignore this email."
-        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
-        subject: "Reset password instructions"
-        wont_change: "Your password won't change until you access the link above and create a new one."
+        change: "Pasahitza aldatu"
+        ignore: "Hau eskatu ez bazenuen, mesedez gutxietsi mezu hau."
+        someone_requested: "Norbaitek pasahitz aldaketarako esteka bat eskatu du, hau egin dezakezu esteka honako esteka jarraituz:"
+        subject: "Pasahitz berreskuraketaren argibideak"
+        wont_change: "Zure pasahitza ez da aldatuko honako esteka jarraitu eta berri bat ezartzen duzun arte."
       unlock_instructions: 
         account_locked: "Zure kontua blokeatu da autentikazio akasdun askoren ondoren."
         click_to_unlock: "Sakatu honako estekan zure kontua askatzeko:"
         subject: "Askatu argibideak"
         unlock: "Askatu nire kontua"
-      welcome: "Welcome %{email}!"
+      welcome: "Ongietorri, %{email}!"
     passwords: 
       edit: 
         change_password: "Nire pasahitza aldatu"
@@ -59,22 +59,22 @@ eu:
       send_instructions: "Hurrengo minutuetan email bat jasoko dituzu pasahitza berrezartzeko argibideekin."
       updated: "Zure pasahitza arrakastaz aldatu duzu. Autentikatuta zaude orain."
     registrations: 
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
-      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
-      updated: "You updated your account successfully."
+      destroyed: "Agur! Zure kontua arrakastaz ezabatu duzu. Laister berriro ikustea espero dugu."
+      signed_up: "Arrakastaz eman duzu izena. Ahal bazen, mezu bat bidalia izan da zure sarrera-ontzira."
+      updated: "Kontua arrakastaz eguneratu duzu."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        login: "Login"
-        modern_browsers: "only supports modern browsers."
-        password: "Password"
-        remember_me: "Remember me"
-        sign_in: "Sign in"
-        username: "Username"
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
+        alpha_software: "Alpha softwarea erabiltzear zaude."
+        bugs_and_feedback: "Jakin dezazula aktsak aurkituko dituzula. Feedback botoia erabiltzera animatzen zaitugu (eskubian) edozein akats bidaltzeko! Ahal dugun azkarren konponduko dugu."
+        bugs_and_feedback_mobile: "Jakin dezazula akatsak aurkitu dituzula. Akatsak bidaltzera animatzen zaitugu! Ahal dugun azkarren egingo dugu lan horiek konpontzeko."
+        login: "Sartu"
+        modern_browsers: "bakarrik nabigatzaile modernoak onartzen ditu."
+        password: "Pasahitza"
+        remember_me: "Gogoratu nazazu"
+        sign_in: "Sartu"
+        username: "Erabiltzailea"
+      signed_in: "Arrakastaz sartu zara."
+      signed_out: "Arrakastaz atera zara."
     shared: 
       links: 
         forgot_your_password: "Zure pasahitza ahaztu duzu?"
@@ -87,7 +87,7 @@ eu:
         sign_up_for_an_invite: "Izena eman gonbidapen bat jasotzeko!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
+        resend_unlock: "Desblokeatzeko argibideak bidali"
       send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
       unlocked: "Your account was successfully unlocked. You are now signed in."
   errors: 
diff --git a/config/locales/devise/devise.is.yml b/config/locales/devise/devise.is.yml
index 46e7efd34..bc369c1eb 100644
--- a/config/locales/devise/devise.is.yml
+++ b/config/locales/devise/devise.is.yml
@@ -35,8 +35,8 @@ is:
         subject: "Þér hefur verið boðið að taka þátt í Diaspora!"
       inviters: 
         accept_at: ", Á% {url}, getur þú samþykkt það í gegnum hlekkinn hér fyrir neðan."
-        has_invited_you: "%{name} hefur boðið þér að taka þátt í Diaspora"
-        have_invited_you: "%{names} hafa boðið þér að taka þátt í Diaspora"
+        has_invited_you: "%{name} hefur boðið þér að taka þátt í Díaspora"
+        have_invited_you: "%{names} hafa boðið þér að taka þátt í Díaspora"
       reset_password_instructions: 
         change: "Breyta lykilorðinu mínu"
         ignore: "Ef þú baðst ekki um þetta, vinsamlegast gefðu þessum tölvupósti þá engan gaum."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 0e01f5498..100b5083e 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -162,6 +162,7 @@ ar:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "¡Invitá a alguien a unirse a Diaspora!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Send invitation"
       to: "To"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index b6bf9cfb2..563301d33 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -162,6 +162,7 @@ ca:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Convida algú a unir-se a Diaspora!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Enviar una invitació"
       send_invitation: "Enviar invitació"
       to: "Per"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 9e97ceb2c..ccc03f6a4 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -162,6 +162,7 @@ cs:
       if_they_accept_info: "pokud přijmou, budou přidáni do aspektu, do kterého byly pozváni."
       invite_someone_to_join: "Pozvěte někoho na Diasporu!"
       personal_message: "Osobní zpráva"
+      resend: "Znovu odeslat"
       send_an_invitation: "Odeslat pozvánku"
       send_invitation: "Odeslat pozvánku"
       to: "Pro"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 60a5980a9..fc5b6ca41 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -162,6 +162,7 @@ cy:
       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"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Send invitation"
       to: "To"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index eee6ff137..689e83591 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -162,6 +162,7 @@ da:
       if_they_accept_info: "hvis de accepterer, vil de blive tilføjet til det aspekt du inviterede dem til."
       invite_someone_to_join: "Invitér en person til Diaspora!"
       personal_message: "Personlig besked"
+      resend: "Resend"
       send_an_invitation: "Send en invitation"
       send_invitation: "Send invitation"
       to: "Til"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 3d7ab54d4..1caf4b1b9 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -162,6 +162,7 @@ de:
       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"
       send_an_invitation: "Eine Einladung senden"
       send_invitation: "Einladung senden"
       to: "An"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 2b9838ba5..52857fd8d 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -21,23 +21,23 @@ el:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "πρέπει να είναι μοναδικό μεταξύ των επαφών του χρήστη."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "είναι ήδη σε χρήση"
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "είναι αντίγραφο ενός προϋπάρχοντος αιτήματος."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "είναι ήδη σε χρήση."
             person: 
-              invalid: "is invalid."
+              invalid: "είναι άκυρη."
             username: 
-              taken: "is already taken."
+              taken: "είναι ήδη σε χρήση."
   ago: "%{time} πριν"
   application: 
     helper: 
@@ -162,6 +162,7 @@ el:
       if_they_accept_info: "αν δεχτούν, θα προστεθούν στην πτυχή που τους πρασκαλέσατε. "
       invite_someone_to_join: "Προσκαλέστε κάποιον στο Diaspora!"
       personal_message: "Προσωπικό μήνυμα"
+      resend: "Resend"
       send_an_invitation: "Στείλτε μια πρόσκληση"
       send_invitation: "Στείλτε πρόσκληση"
       to: "Στον"
@@ -170,7 +171,7 @@ el:
       have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ"
       logged_in_as: "σύνδεση ως %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      toggle: "toggle mobile site"
+      toggle: "εναλλαγή ιστοσελίδας κινητού"
       whats_new: "Τι νέα?"
       your_aspects: "οι πτυχές σας"
     header: 
@@ -197,7 +198,7 @@ el:
     index: 
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
-    mentioned: "has mentioned you in their"
+    mentioned: "σας ανέφερε στο"
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
     post: "δημοσίευση"
     request_accepted: "δέχτηκε το αίτημα σας για διαμοιρασμό. "
@@ -205,21 +206,21 @@ el:
     also_commented: 
       commented: "σχολίασε επίσης τη δημοσίευση του χρήστη %{post_author} :"
       sign_in: "Συνδεθείτε για να το δείτε."
-      subject: "Ο χρήστης %{name} επίσης σχολίασε."
+      subject: "Ο/Η %{name} επίσης σχολίασε στη δημοσίευση της επαφής σας."
     comment_on_post: 
-      commented: "σχολίασε τη δημισίευση σας!"
+      commented: "έχει σχολιάσει σε δημοσίευση σας:"
       sign_in: "Συνδεθείτε για να το δείτε."
       subject: "Ο χρήστης %{name} σχολίασε τη δημοσίευση σας."
     diaspora: "ρομπότ για τα email του δικτύου Diaspora"
     hello: "Γειά σου %{name}!"
     love: "αγάπη,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
+      sign_in: "Συνδεθείτε για να το δείτε."
+      subject: "Ο/Η %{name} σας αναφέρει στο Diaspora*"
     new_request: 
       just_sent_you: "έχετε ένα νέο αίτημα φίλου στο Diaspora*"
-      sign_in: "Είσοδος"
+      sign_in: "Είσοδος εδώ"
       subject: "έχετε νέο αίτημα επαφής Diaspora από τον χρήστη %{from}"
       try_it_out: "Θα πρέπει πραγματικά να σκεφτείτε να το ελέγξετε."
     request_accepted: 
@@ -279,10 +280,10 @@ el:
       accepts: "Μόλις ο χρήστης %{name} δεχθεί, θα αρχίσει ο καθένας να βλέπει τις δημοσιεύσεις του άλλου στο Diaspora"
       share_with: "Αρχή διαμοιρασμού με τον χρήστη %{name}"
     share_with_pane: 
-      add_new_aspect: "add new aspect"
+      add_new_aspect: "προσθήκη νέας πτυχής"
     show: 
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
-      incoming_request: "Έχετε ένα εισερχόμενο αίτημα από αυτό το πρόσωπο."
+      incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
       no_posts: "κανένα μήνυμα προς εμφάνιση!"
       not_connected: "Δεν είστε συνδεδεμένος με τον χρήστη %{name}"
       recent_posts: "Πρόσφατες δημοσιεύσεις"
@@ -319,12 +320,12 @@ el:
     photo: 
       view_all: "δες όλες τις φωτογραφίες του χρήστη %{name}"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "permalink συλλογής"
       delete_photo: "Διαγραφή Φωτογραφίας"
       edit: "Επεξεργασία"
       edit_delete_photo: "Επεξεργασία περιγραφής φωτογραφίας / διαγραφή φωτογραφίας"
       make_profile_photo: "ορισμός ως φωτογραφίας προφίλ"
-      original_post: "Original Post"
+      original_post: "Αυθεντική Δημοσίευση"
       permalink: "permalink"
       update_photo: "Ενημέρωση Φωτογραφίας"
       view: "προβολή"
@@ -425,7 +426,7 @@ el:
       all: "όλα"
       all_contacts: "όλες οι επαφές"
       make_public: "Δημοσιοποίησε το"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      mention_helper_text: "για να αναφέρεις κάποιον, πάτα το '@' και αρχίσε να πληκτρολογείς το όνομά του"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στο %{aspect}"
       posting: "Ανάρτηση..."
       share: "Μοιράσου"
@@ -435,7 +436,7 @@ el:
       reshare: "Μοιράσου και πάλι"
   status_messages: 
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Αποτυχία διαγραφής δημοσίευσης"
     helper: 
       no_message_to_display: "Κανένα μήνυμα"
     new_status_message: 
@@ -467,7 +468,7 @@ el:
       your_email: "Το email σας"
       your_handle: "Το αναγνωριστικό σας στο diaspora"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "Σύνδεση στο Diaspora"
       connect_services: "Συνδεθείτε με άλλες υπηρεσίες"
       edit_profile: "Επεξεργασία του προφίλ σας"
       finished: "Τέλος!"
@@ -475,11 +476,11 @@ el:
       signup_steps: "Ολοκληρώστε την εγγραφή σας συμπληρώνοντας τα παρακάτω τρία βήματα:"
       skip: "παράλειψη της εισαγωγής"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Θα θέλατε να βρείτε τους φίλους σας από το Facebook στο Diaspora;"
+        skip: "Παράλειψη"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "Τέλος"
+        people_already_on_diaspora: "Άνθρωποι ήδη στο Diaspora"
       welcome: "Καλώς ήλθατε στο Diaspora!"
     public: 
       does_not_exist: "Ο χρήστης %{username} δεν υπάρχει!"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index f80d4f4f1..561eec86e 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -162,6 +162,7 @@ en_shaw:
       if_they_accept_info: "𐑦𐑓 𐑞𐑱 𐑩𐑒𐑕𐑧𐑐𐑑, 𐑞𐑱 𐑢𐑦𐑤 𐑚𐑰 𐑨𐑛𐑩𐑛 𐑑 𐑞 𐑨𐑕𐑐𐑧𐑒𐑑 𐑿 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑧𐑥."
       invite_someone_to_join: "𐑦𐑯𐑝𐑲𐑑 𐑕𐑳𐑥𐑢𐑩𐑯 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
       personal_message: "𐑐𐑻𐑕𐑩𐑯𐑩𐑤 𐑥𐑧𐑕𐑩𐑡"
+      resend: "Resend"
       send_an_invitation: "𐑕𐑧𐑯𐑛 𐑩𐑯 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
       send_invitation: "𐑕𐑧𐑯𐑛 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
       to: "𐑑"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 49be03bba..7e0302733 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -162,6 +162,7 @@ eo:
       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"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Send invitation"
       to: "Al"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index da45fff48..098d88953 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -162,6 +162,7 @@ es-CL:
       if_they_accept_info: "Si aceptan, ellos se agregarán al aspecto que los invitaste."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora!"
       personal_message: "Mensaje personal"
+      resend: "Resend"
       send_an_invitation: "Enviar una invitación"
       send_invitation: "Enviar invitación"
       to: "A"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 291d96032..ab51469ad 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -162,6 +162,7 @@ es:
       if_they_accept_info: "Si aceptan, serán añadidos al Aspecto que selecciones."
       invite_someone_to_join: "¡Invita a alguien a unirse a Diaspora*!"
       personal_message: "Mensaje Personal"
+      resend: "Resend"
       send_an_invitation: "Enviar una invitación"
       send_invitation: "Enviar invitación"
       to: "Para"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 92dac24ea..7df5ab415 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -6,7 +6,7 @@
 eu: 
   _aspect: "Alderdia"
   _aspects: "Alderdiak"
-  _comment: "Comment"
+  _comment: "Iruzkindu"
   _comments: "Iruzkinak"
   _contact: "Adiskidea"
   _contacts: "Adiskideak"
@@ -53,8 +53,8 @@ eu:
       success: "Adiskidea arrakastaz gehitu da alderdira."
     aspect_contacts: 
       done_editing: "aldaketa arrakastatsua"
-    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: "Alderdi honetako adiskideak nor dagoen bere alderdian ezingo dute ikusi."
+    contacts_visible: "Alderdi honetako adiskideak jokingo dute nor dagoen alderdian."
     create: 
       failure: "Akatsa alderdiaren sormenean."
       success: "Zure alderdia, %{name}, sortua izan da."
@@ -63,10 +63,10 @@ eu:
     edit: 
       add_existing: "Jada adiskide den norbait gehitu"
       confirm_remove_aspect: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
-      make_aspect_list_visible: "make aspect list visible to others in aspect"
+      make_aspect_list_visible: "alderdi zerrenda publikoa egin"
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
-      save: "Save"
+      save: "Gorde"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
       aspect_not_empty: "Alderdi ez hutsa"
@@ -121,7 +121,7 @@ eu:
   date: 
     formats: 
       birthday: "%B %d"
-      birthday_with_year: "%B %d %Y"
+      birthday_with_year: "%Y &B %d"
       fullmonth_day: "%B %d"
   delete: "Ezabatu"
   email: "E-posta"
@@ -162,17 +162,18 @@ eu:
       if_they_accept_info: "eskaera onartzen badute, gonbidatutako alderdira batuko dira"
       invite_someone_to_join: "Gonbida ezazu norbait Diasporan izen ematera!"
       personal_message: "Mezu pertsonala"
+      resend: "Resend"
       send_an_invitation: "Gonbidapen bat bidali"
       send_invitation: "Gonbidapena bidali"
       to: "Jasotzailea:"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
-      logged_in_as: "logged in as %{name}"
+      have_a_problem: "Arazoren bat? Aurkitu erantzuna hemen"
+      logged_in_as: "%{name} zara."
       powered_by: "DIASPORA*K ESKAINIA"
       toggle: "toggle mobile site"
       whats_new: "ezer berririk?"
-      your_aspects: "your aspects"
+      your_aspects: "zure alderdiak"
     header: 
       account_settings: "kontuaren lehentasunak"
       blog: "bloga"
@@ -319,19 +320,19 @@ eu:
     photo: 
       view_all: "%{aspect}(r)en argazki guztiak ikusi"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "bildumako permalink"
       delete_photo: "Argazkia Ezabatu"
       edit: "aldatu"
       edit_delete_photo: "Argazkiaren deskribapena aldatu / argazkia ezabatu"
       make_profile_photo: "profileko argazki bihurtu"
-      original_post: "Original Post"
+      original_post: "Jatorrizko mezua"
       permalink: "permalink"
       update_photo: "Argazkia Igo"
       view: "ikusi"
     update: 
       error: "Akatsa argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
-  previous: "previous"
+  previous: "aurrekoa"
   profile: "Profila"
   registrations: 
     closed: "Izen emateak itxirik daude Diaspora zerbitzari hontan."
@@ -425,17 +426,17 @@ eu:
       all: "guztiak"
       all_contacts: "adiskide guztiak"
       make_public: "publikoa egin"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      mention_helper_text: "norbait aipatzeko, idatzi '@' eta hasi adiskidearen izena idazten"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
       share: "Partekatu"
       share_with: "%{aspect}(r)ekin partekatu"
-      whats_on_your_mind: "what's on your mind?"
+      whats_on_your_mind: "zer berri?"
     reshare: 
       reshare: "Berriz partekatu"
   status_messages: 
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Akatsa mezua ezabatzean"
     helper: 
       no_message_to_display: "Erakusteko mezurik ez."
     new_status_message: 
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 9fefd0e7c..849783b5a 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -162,6 +162,7 @@ fi:
       if_they_accept_info: "jos he hyväksyvät kutsun, heidät lisätään siihen näkymään, johon heidät kutsuit."
       invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!"
       personal_message: "Henkilökohtainen viesti"
+      resend: "Resend"
       send_an_invitation: "Lähetä kutsu"
       send_invitation: "Lähetä kutsu"
       to: "Vastaanottaja"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 6d4cc83ee..8c13650eb 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -162,6 +162,7 @@ fr:
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect dans lequel vous les avez invités."
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
       personal_message: "Message personnel"
+      resend: "Resend"
       send_an_invitation: "Envoyer une invitation"
       send_invitation: "Envoyer l'invitation"
       to: "À"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 66e02ce36..576deb431 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -162,6 +162,7 @@ ga:
       if_they_accept_info: "má gleachann siad, beidh siad cuirthe leis an gné a sheol tú cuireadh ó."
       invite_someone_to_join: "Seol cuireadh go Diaspora chuig duine!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Seol cuireadh"
       send_invitation: "Seol an cuireadh"
       to: "Go dtí"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 129a548cc..f5e0826a9 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -162,6 +162,7 @@ gl:
       if_they_accept_info: "se aceptan, serán engadidos ao aspecto ao que os convidaches."
       invite_someone_to_join: "Convida a alguén a participar en Diaspora!"
       personal_message: "Mensaxe persoal"
+      resend: "Resend"
       send_an_invitation: "Mensaxe persoal"
       send_invitation: "Enviar unha invitación"
       to: "a"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 75162c296..82746a2cb 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -162,6 +162,7 @@ he:
       if_they_accept_info: "אם הם יאשרו, הם יתווספו להיבט שאליו הזמנת אותם."
       invite_someone_to_join: "להזמין מישהו להשתמש בדיאספורה!"
       personal_message: "הודעה אישית"
+      resend: "Resend"
       send_an_invitation: "שליחת הזמנה"
       send_invitation: "שליחת הזמנה"
       to: "אל"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 070b7a72f..777ba371a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -162,6 +162,7 @@ hu:
       if_they_accept_info: "Ha elfogadják felkérésed, akkor belekerülnek abba a csoportba amelyikbe meghívtad őket."
       invite_someone_to_join: "Hívj meg valakit, hogy csatlakozzon a Diaspora-hoz!"
       personal_message: "Személyes üzenet"
+      resend: "Resend"
       send_an_invitation: "Küldj egy meghívót"
       send_invitation: "Meghívás küldése"
       to: "Címzett"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 8bc74addd..c7f9e4eaf 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -162,6 +162,7 @@ id:
       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"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Send invitation"
       to: "To"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 930f23e8b..6ed1f4927 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -25,7 +25,7 @@ is:
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "er þegar frátekið."
         request: 
           attributes: 
             from_id: 
@@ -45,7 +45,7 @@ is:
         all_aspects: "All aspects"
       unknown_person: "unknown person"
       video_title: 
-        unknown: "Unknown Video Title"
+        unknown: "Óþekktur vídeótitill"
   are_you_sure: "Ertu viss?"
   aspects: 
     add_to_aspect: 
@@ -61,28 +61,28 @@ is:
     destroy: 
       success: "það heppnaðist að fjarlægja %{name}."
     edit: 
-      add_existing: "Add an existing contact"
+      add_existing: "Bæta við tengilið sem er þegar til"
       confirm_remove_aspect: "Are you sure you want to delete this aspect?"
       make_aspect_list_visible: "make aspect list visible to others in aspect"
       remove_aspect: "Delete this aspect"
-      rename: "rename"
+      rename: "breyta nafni"
       save: "Vista"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
       aspect_not_empty: "Aspect not empty"
       remove: "fjarlægja"
     index: 
-      handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      handle_explanation: "Þetta er netfangið þitt hjá Díaspora. Eins og með venjulegt netfang, geturðu gefið fólki það svo þau geti haft samband við þig. "
       no_contacts: "Engir tengiliðir"
     manage: 
       add_a_new_aspect: "Add a new aspect"
       add_a_new_contact: "Bæta nýjum tengilið við"
-      drag_to_add: "Drag to add people"
+      drag_to_add: "Dragðu til að bæta fólki við"
       manage_aspects: "Manage aspects"
       no_requests: "Engar nýjar beiðnir"
       requests: "Beiðnir"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
+      error: "Villa við að breyta tengiliði: %{inspect}"
       failure: "virkaði ekki %{inspect}"
       success: "Person moved to new aspect"
     new_aspect: 
@@ -93,7 +93,7 @@ is:
       add_contact_to: "Bæta einhverjum við %{aspect_name}"
       invite: "Bjóddu einhverjum að tengjast Diaspora!"
       nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+      nobody_in_aspect: "Ásýndin þín '%{aspect_name}' er auð."
     no_posts_message: 
       start_talking: "Enginn hefur sagt neitt enn.  Byrjaðu umræðurnar!"
     remove_from_aspect: 
@@ -127,14 +127,14 @@ is:
   email: "Netfang"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
+      correct_the_following_errors_and_try_again: "Það þarf að lagfæra eftirfarandi villur og reyna síðan aftur. "
       invalid_fields: "Invalid Fields"
-  fill_me_out: "Fill me out"
+  fill_me_out: "Fylla út"
   home: 
     show: 
       already_account: "nú þegar með notandastillingar?"
       choice: "Choice"
-      choice_explanation: "Diaspora gerir þér kleift að raða tengingum í hópa sem kallast hliðar. Einungis í Diaspora tryggja hliðar að myndir þínar, sögur og brandarar séu einungis samnýtt með þeim sem þú ætlar. "
+      choice_explanation: "Diaspora gerir þér kleift að raða tengingum í hópa sem kallast ásýndir. Einungis í Diaspora tryggja ásýndir að myndir þínar, sögur og brandarar séu einungis samnýtt með þeim sem þú ætlar. "
       learn_about_host: "Learn about how to host your own Diaspora server."
       login_here: "innskráning hér"
       ownership: "Eignarréttur"
@@ -149,33 +149,34 @@ is:
       not_found: "Invitation token not found"
     create: 
       already_contacts: "Þú tengist þessari manneskju nú þegar"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
-      rejected: "The following email addresses had problems: "
-      sent: "Invitations have been sent to: "
+      already_sent: "Þessari manneskju hefur þegar verið boðið."
+      no_more: "Ekki eru til fleiri boðsmiðar."
+      rejected: "Eftirfarandi netföng ollu vandræðum: "
+      sent: "Boðsmiðar hafa verið sendir til:"
     edit: 
       sign_up: "sign_up"
     new: 
       already_invited: "Nu þegar boðið"
       aspect: "Aspect"
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
-      invite_someone_to_join: "Bjóddu einhverjum að tengjast Diaspora!"
+      comma_seperated_plz: "Þú getur sett inn mörg netföng með því að aðskilja þau með kommu. "
+      if_they_accept_info: "ef þau þiggja boðið, verður þeim bætt við þá ásýnd sem þú bauðst þeim á."
+      invite_someone_to_join: "Bjóddu einhverjum að tengjast Díaspora!"
       personal_message: "Persónuleg skilaboð"
-      send_an_invitation: "Send an invitation"
-      send_invitation: "Send invitation"
-      to: "To"
+      resend: "Resend"
+      send_an_invitation: "Sendu boðsmiða"
+      send_invitation: "Senda boðsmiða"
+      to: "Til"
   layouts: 
     application: 
       have_a_problem: "Have a problem? Find an answer here"
       logged_in_as: "innskráð/ur sem% {Nafn}"
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "DÍASPORA* STJÓRNAR HÉR"
       toggle: "toggle mobile site"
       whats_new: "hvað er að frétta?"
       your_aspects: "your aspects"
     header: 
       account_settings: "stillingar"
-      blog: "blog"
+      blog: "blogg"
       code: "code"
       edit_profile: "edit profile"
       login: "Innskráning"
@@ -184,10 +185,10 @@ is:
   more: "Meira"
   new_notifications: "%{count} nýjar tilkynningar"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "%{count} nýjar beiðnir!"
+    one: "nýjar beiðnir!"
+    other: "%{count} nýjar beiðnir!"
+    zero: "engar nýjar beiðnir"
   next: "næsta"
   no_new_notifications: "engar nýjar tilkynningar"
   notifications: 
@@ -205,9 +206,9 @@ is:
     also_commented: 
       commented: "hefur einnig gert athugasemd við færslu notandans %{post_author}:"
       sign_in: "Skráðu þig inn til að skoða það."
-      subject: "%{name} hefur einnig gert athugasemd."
+      subject: "%{name} hefur einnig gert athugasemd við færslu tengiliðar þíns. "
     comment_on_post: 
-      commented: "has commented on your post!"
+      commented: "hefur gert athugasemd við færsluna þína!"
       sign_in: "Skráðu þig inn til að sjá það."
       subject: "%{name} hefur gert atugasemd við þína færslu."
     diaspora: "the diaspora email robot"
@@ -219,7 +220,7 @@ is:
       subject: "%{name} has mentioned you on Diaspora*"
     new_request: 
       just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "sign in here"
+      sign_in: "innskráning hér"
       subject: "new Diaspora* contact request from %{from}"
       try_it_out: "Þú ættir virkilega að skoða það."
     request_accepted: 
@@ -257,7 +258,7 @@ is:
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " niðurstöður fyrir %{params}"
     index: 
-      couldnt_find_them_send_invite: "Þau fundust ekki?  Senda boðskort!"
+      couldnt_find_them_send_invite: "Þau fundust ekki?  Senda boðsmiða!"
       no_one_found: "...og enginn fannst."
       no_results: "Hey! Þú þarft að leita að einhverju."
       results_for: "leitarniðurstöður fyrir"
@@ -295,27 +296,27 @@ is:
       failed: "Ekki tókst að uppfæra síðuna mína"
       updated: "Síðan mín var uppfærð"
     webfinger: 
-      fail: "Sorry, we couldn't find %{handle}."
+      fail: "Því miður, %{handle} fannst ekki."
   photos: 
     create: 
       integrity_error: "Photo upload failed.  Are you sure that was an image?"
-      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-      type_error: "Photo upload failed.  Are you sure an image was added?"
+      runtime_error: "Innsetning á mynd mistóḱst.  Ertu viss um að sætisbeltin séu spennt?"
+      type_error: "Innsetning á mynd mistóḱst. Ertu viss um að mynd hafi verið bætt við?"
     destroy: 
       notice: "Mynd eytt."
     edit: 
       editing: "Breyti"
     new: 
-      back_to_list: "Back to List"
+      back_to_list: "Til baka í listann"
       new_photo: "New Photo"
-      post_it: "post it!"
+      post_it: "færa inn!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
+      empty: "{file} skráin er tóm, veldu vinsamlegast skrárnar aftur en slepptu henni."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      size_error: "{file} skráin er of stór, mesta stærð er {sizeLimit}."
     new_profile_photo: 
       or_select_one: "eða veldu eitthvað úr núverandi "
-      upload: "Upload a new profile photo!"
+      upload: "Setja upp nýja mynd!"
     photo: 
       view_all: "skoða allar myndir hjá notandanum %{name}'"
     show: 
@@ -329,8 +330,8 @@ is:
       update_photo: "Uppfæra mynd"
       view: "sýn"
     update: 
-      error: "Failed to edit photo."
-      notice: "Photo successfully updated."
+      error: "Ekki tókst að breyta mynd."
+      notice: "Velheppnuð uppfærsla á mynd. "
   previous: "fyrra"
   profile: "Síðan mín"
   registrations: 
@@ -354,7 +355,7 @@ is:
   requests: 
     create: 
       sending: "Sendi"
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sent: "%{name} hefur verið beðin(n) um að tengjast þér.  Þau ættu að sjá það þegar þau logga næst inn í Díaspora."
     destroy: 
       error: "Please select an aspect!"
       ignore: "Ignored contact request."
@@ -396,22 +397,22 @@ is:
   settings: "Stillingar"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "Finna fólk eftir Díaspora netfangi"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Skrifaðu notandanafn hjá Diaspora:"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Veistu netföngin þeirra? Þú ættir að senda þeim boðsmiða"
       your_diaspora_username_is: "Þitt Diaspora notandanafn er: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Allir tengiliðir"
       cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
     invitations: 
-      by_email: "by Email"
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      by_email: "með tölvupósti"
+      dont_have_now: "Þú átt enga boðsmiða núna, en þeir koma fljótlega!"
       from_facebook: "Frá Facebook"
-      invitations_left: "(%{count} left)"
-      invite_someone: "Invite someone"
-      invite_your_friends: "Invite your friends"
-      invites: "Invites"
+      invitations_left: "(%{count} eftir)"
+      invite_someone: "Bjóddu einhverjum"
+      invite_your_friends: "Bjóddu vinafólki þínu"
+      invites: "Boðsmiðar"
       invites_closed: "Invites are currently closed on this Diaspora pod"
     notification: 
       new: "Nýtt %{type} frá %{from}"
@@ -465,7 +466,7 @@ is:
       new_password: "Nýtt lykilorð"
       receive_email_notifications: "Fá tilkynningar í tölvupósti?"
       your_email: "Netfangið þitt"
-      your_handle: "Your diaspora handle"
+      your_handle: "Díaspora netfangið þitt."
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Tengjast öðrum þjónustum þínum"
@@ -480,7 +481,7 @@ is:
       step_3: 
         finish: "Finish"
         people_already_on_diaspora: "People already on Diaspora"
-      welcome: "Welcome to Diaspora!"
+      welcome: "Velkomin(n) í Diaspora!"
     public: 
       does_not_exist: "Notandinn %{username} er ekki til!"
     update: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 1c5d10dc8..3c7d17df7 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -162,6 +162,7 @@ it:
       if_they_accept_info: "se loro accettano, saranno aggiunti all'aspetto in cui li hai invitati."
       invite_someone_to_join: "Invita qualcuno ad unirsi a Diaspora!"
       personal_message: "Messaggio privato"
+      resend: "Resend"
       send_an_invitation: "Invia un invito"
       send_invitation: "Invito inviato"
       to: "A"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 93cc5e3f9..6525849c0 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -162,6 +162,7 @@ lt:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Pakviesk ką nors prisijungti prie Diasporos!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Nusiųsk kvietimą"
       send_invitation: "Siųsti kvietimą"
       to: "Kam"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 820f988ee..f5f8e6591 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -162,6 +162,7 @@ mk:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Поканете некој да се придружи на Diaspora!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Испрати покана"
       send_invitation: "Испрати покана"
       to: "До"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 1a9ca6342..910cfe2a0 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -162,6 +162,7 @@ nb:
       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"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Send invitation"
       to: "To"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 1ee4a420c..ca4249105 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -162,6 +162,7 @@ nl:
       if_they_accept_info: "als hij of zij accepteert zal hij of zij toegevoegd worden aan het aspect waarvoor je hem of haar uitgenodigd hebt."
       invite_someone_to_join: "Nodig iemand uit om lid te worden op Diaspora!"
       personal_message: "Persoonlijk bericht"
+      resend: "Stuur opnieuw"
       send_an_invitation: "Stuur een uitnodiging"
       send_invitation: "Verstuur uitnodiging"
       to: "Aan"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 446e4ecf0..896ddec3a 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -162,6 +162,7 @@ pl:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Zaproś kogoś do Diaspory!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Wyślij zaproszenie"
       send_invitation: "Wyślij zaproszenie"
       to: "Do"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 7ff91d413..11c3b08f6 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -162,6 +162,7 @@ pt-BR:
       if_they_accept_info: "Se aceitarem, eles serão adicionados ao aspecto para o qual você os convidou."
       invite_someone_to_join: "Convide seus amigos para a Diaspora*!"
       personal_message: "Mensagem pessoal"
+      resend: "Resend"
       send_an_invitation: "Enviar convite"
       send_invitation: "Enviar convite"
       to: "Para"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 304143b09..01c4a00b8 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -162,6 +162,7 @@ pt-PT:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Convida alguém para se juntar ao Diaspora!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Envia um convite"
       send_invitation: "Enviar convite"
       to: "Para"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 6de4dca6d..285387144 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -162,6 +162,7 @@ ro:
       if_they_accept_info: "în cazul în care acceptă, acestea vor fi adăugate la aspectul la care ai le-ai invitat."
       invite_someone_to_join: "Invită pe cineva pe Diaspora!"
       personal_message: "Mesaj personal"
+      resend: "Resend"
       send_an_invitation: "Trimite o invitaţie"
       send_invitation: "Trimite invitaţie"
       to: "Pentru"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index beebb7d66..bbca3274e 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -162,6 +162,7 @@ ru:
       if_they_accept_info: "после согласия с их стороны, они будут добавлены в предложенный вами аспект."
       invite_someone_to_join: "Пригласить кого-либо в Диаспору!"
       personal_message: "Личное сообщение"
+      resend: "Resend"
       send_an_invitation: "Отправить приглашение"
       send_invitation: "Отправить приглашение"
       to: "Для"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 834893541..ee5eab406 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -162,6 +162,7 @@ sk:
       if_they_accept_info: "Po odsúhlasení budú pozvaní užívatelia pridaný do aspektu."
       invite_someone_to_join: "Pozvite niekoho do Diaspory*!"
       personal_message: "Súkromná správa"
+      resend: "Resend"
       send_an_invitation: "Send an invitation"
       send_invitation: "Poslať pozvánku"
       to: "Komu"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index bf4c4dc7a..823c941db 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -162,6 +162,7 @@ sl:
       if_they_accept_info: "v kolikor sprejmejo vaše povabilo, bodo samodejno dodani skupinam v katere ste jih povabili."
       invite_someone_to_join: "Povabi druge, da se pridružijo v Diasporo!"
       personal_message: "Osebno sporočilo"
+      resend: "Resend"
       send_an_invitation: "Pošlji povabilo"
       send_invitation: "Pošlji povabilo"
       to: "Za"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1d9834e71..00dd3e437 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -162,6 +162,7 @@ sv:
       if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
       invite_someone_to_join: "Bjud in en vän till Diaspora!"
       personal_message: "Personligt meddelande"
+      resend: "Resend"
       send_an_invitation: "Skicka en inbjudan"
       send_invitation: "Skicka inbjudan"
       to: "Till"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index a790f31fb..22c0aa018 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -162,6 +162,7 @@ tr:
       if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
       invite_someone_to_join: "Diaspora'ya birilerini davet et!"
       personal_message: "Personal message"
+      resend: "Resend"
       send_an_invitation: "Bir davet yolla"
       send_invitation: "Davetiye yolla"
       to: "To"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index adbe7e813..dcd3504e0 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -162,6 +162,7 @@ zh:
       if_they_accept_info: "一旦邀请被接受，他们就会被加入这个分组。"
       invite_someone_to_join: "邀请些人加入Diaspora！"
       personal_message: "个人消息"
+      resend: "Resend"
       send_an_invitation: "发送一份邀请"
       send_invitation: "发送邀请"
       to: "给"
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index e55957812..115105e04 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -9,7 +9,7 @@ el:
     search_for: "Αναζήτηση για {{name}}"
     shared: 
       contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+        cannot_remove: "Δεν είναι δυνατή η αφαίρεση του ατόμου από την τελευταία πτυχή. (Αν θέλετε να αποσυνδεθείτε από το άτομο αυτό πρέπει να αφαιρέσετε την επαφή.)"
     timeago: 
       day: "μία μέρα"
       days: "%d μέρες"
diff --git a/config/locales/rails-i18n/id.yml b/config/locales/rails-i18n/id.yml
index 0651137d2..92ee9c677 100644
--- a/config/locales/rails-i18n/id.yml
+++ b/config/locales/rails-i18n/id.yml
@@ -11,8 +11,8 @@ id:
       long: "%A, %d %B %Y"
       short: "%d.%m.%Y"
  
-    day_names: [Minggu,Senin, Selasa, Rabu, Kamis, Jum'at, Sabtu]
-    abbr_day_names: [Minggu,Senin, Selasa, Rabu, Kamis, Jum'at, Sabtu]
+    day_names: [Minggu, Senin, Selasa, Rabu, Kamis, Jum'at, Sabtu]
+    abbr_day_names: [Min, Sen, Sel, Rab, Kam, Jum, Sab]
     month_names: [~, Januari, Februari, Maret, April, Mei, Juni, Juli, Agustus, September, Oktober, November, Desember]
     abbr_month_names: [~, Jan, Feb, Mar, Apr, Mei, Jun, Jul, Agu, Sep, Okt, Nov, Des]
     order: [:day, :month, :year]