lithuanian is at 100% now, thanks to tahu, Karolis Parfeniukas, Saulius Žemaitaitis and Evaldas Guogis - also some updates to other locales, as always big thank you to all contributors

11 files changed, 596 insertions, 595 deletions

diff --git a/config/languages.yml b/config/languages.yml
index 83a13316b..6a698f167 100644
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -9,6 +9,7 @@ available:
   he: 'עברית'
   id: 'Bahasa Indonesia'
   it: 'Italiano'
+  lt: 'Lietuviškai'
   nb: 'Norske'
   nl: 'Nederlands'
   pt-BR: 'Português'
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 3115ba9d4..4d2fc1e83 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -78,13 +78,13 @@ de:
       links: 
         forgot_your_password: "Passwort vergessen?"
         receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Hast du keine Entsperr-Anweisungen erhalten?"
         sign_in: "Anmelden"
         sign_up: "Registrieren"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Öffentliche Registrierungen sind momentan nicht möglich."
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
+        resend_unlock: "Entsperr-Anweisungen erneut senden"
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst."
       unlocked: "Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet."
   errors: 
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 201b28782..b28a7c46a 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -8,25 +8,25 @@ es:
     confirmations: 
       confirmed: "Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta."
       new: 
-        resend_confirmation: "Vuelva a enviar instrucciones de confirmación"
+        resend_confirmation: "Volver a enviar instrucciones de confirmación"
       send_instructions: "Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos."
     failure: 
-      inactive: "Tu cuenta no ha sido activada."
-      invalid: "Contraseña o Email incorrecto."
-      invalid_token: "Token de autenticación incorrecto."
-      locked: "Tu cuenta esta bloqueada."
+      inactive: "Tu cuenta aun no ha sido activada."
+      invalid: "Contraseña o email incorrecto."
+      invalid_token: "Identificador de autenticación incorrecto."
+      locked: "Tu cuenta está bloqueada."
       timeout: "Tu sesión ha expirado, por favor accede de nuevo para continuar."
       unauthenticated: "Necesitas acceder a tu cuenta o registrarte antes de continuar."
       unconfirmed: "Necesitas confirmar tu cuenta antes de continuar."
     invitations: 
       invitation_token_invalid: "El identificador de la invitación no es valido!"
       send_instructions: "Tu invitación se ha enviado."
-      updated: "Tu contraseña ha sido configurada correctamente. Ahora estas conectado."
+      updated: "Tu contraseña ha sido configurada correctamente. Ahora estás conectado."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmar mi cuenta"
         subject: "Instrucciones de confirmación"
-        you_can_confirm: "Usted puede confirmar su cuenta a través del siguiente enlace:"
+        you_can_confirm: "Puedes confirmar tu cuenta a través del siguiente enlace:"
       hello: "Hola %{email}!"
       invitation: 
         accept: "Aceptar la invitación"
@@ -34,13 +34,13 @@ es:
         no_account_till: "Tu cuenta no será creada hasta que accedas al enlace de arriba y te identifiques."
         subject: "¡Has sido invitado a participar en Diaspora!"
       inviters: 
-        accept_at: ", en %{url}, puedes aceptar en el siguiente link."
+        accept_at: ", en %{url}, puedes aceptar en el siguiente enlace."
         has_invited_you: "%{name} te ha invitado a unirte a Diaspora"
-        have_invited_you: "%{names} han invitado a unirse a Diáspora"
+        have_invited_you: "%{names} te han invitado a unirte a Diaspora"
       reset_password_instructions: 
         change: "Cambiar mi contraseña"
         ignore: "Si no has solicitado esto, por favor ignora este mensaje."
-        someone_requested: "Alquien ha solicitado un enlace para cambiar tu contraseña, y tu puedes hacerlo con el siguiente link."
+        someone_requested: "Alguien ha solicitado un enlace para cambiar tu contraseña, y tú puedes hacerlo con el siguiente enlace."
         subject: "Instrucciones para cambiar tu contraseña"
         wont_change: "Su contraseña no cambiará hasta que acceda al enlace anterior y cree uno nuevo."
       unlock_instructions: 
@@ -58,16 +58,16 @@ es:
       send_instructions: "Recibirás un email con instrucciones para cambiar tu contraseña en pocos minutos."
       updated: "Tu contraseña ha sido modificada. Ya has accedido a tu cuenta."
     registrations: 
-      destroyed: "!Adiós! Tu cuenta ha sido cancelada. Esperamos verte pronto."
+      destroyed: "!Adiós! Tu cuenta ha sido cancelada. Esperamos volver a verte pronto."
       signed_up: "Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación."
       updated: "Has actualizado tu cuenta correctamente."
     sessions: 
       new: 
-        alpha_software: "Está a punto de utilizar software en versión alfa."
-        bugs_and_feedback: "Tenga en cuenta, usted puede experimentar errores. Le animamos a que utilice el botón de reportar situado a la derecha de su navegador para reportar cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema del que usted nos informe."
+        alpha_software: "Estás a punto de utilizar software en versión alfa."
+        bugs_and_feedback: "Ten en cuenta que puedes experimentar errores. ¡Te animamos a que utilices el botón de Informar situado a la derecha de tu navegador para informar cualquier fallo! Trabajaremos tan rápido como nos sea posible para resolver cualquier problema del que tú nos informes."
         have_a_problem: "¿Tienes un problema? Encuentra la respuesta aquí"
         login: "Iniciar sesión"
-        modern_browsers: "sólo es compatible con los navegadores modernos."
+        modern_browsers: "sólo es compatible con navegadores actuales."
         password: "Contraseña"
         remember_me: "Recordarme"
         sign_in: "Ingresar"
@@ -81,10 +81,10 @@ es:
         receive_unlock: "No has recibido las instrucciones de desbloqueo?"
         sign_in: "Ingresar"
         sign_up: "Regístrate"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Los registros están cerrados temporalmente."
     unlocks: 
       new: 
-        resend_unlock: "Vuelva a enviar las instrucciones de desbloqueo"
+        resend_unlock: "Volver a enviar las instrucciones de desbloqueo"
       send_instructions: "Recibirás un email con instrucciones para desbloquear tu cuenta en pocos minutos."
       unlocked: "Tu cuenta ha sido desbloqueada. Ya has accedido a tu cuenta."
   errors: 
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index a5f3b1212..fca9f5162 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -81,7 +81,7 @@ fr:
         receive_unlock: "Vous n'avez pas reçu les instructions de déblocage ?"
         sign_in: "Connexion"
         sign_up: "Inscription"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Les inscriptions libres sont fermées pour l'instant."
     unlocks: 
       new: 
         resend_unlock: "Renvoyer les instructions de déblocage"
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 78c02fd7b..e6e91f614 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -6,87 +6,87 @@
 lt: 
   devise: 
     confirmations: 
-      confirmed: "Paskyra patvirtinta. Prisijungėte."
+      confirmed: "Paskyra patvirtinta. Prisijungta."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
-      send_instructions: "Netrukus gausite el. laišką su nurodymais paskyros patvirtinimui."
+        resend_confirmation: "Siųsti patvirtinimo nurodymus iš naujo"
+      send_instructions: "Netrukus bus išsiųstas el. laiškas su nurodymais, kaip patvirtinti paskyrą."
     failure: 
       inactive: "Paskyra dar neaktyvuota."
       invalid: "Neteisingas el. pašto adresas arba slaptažodis."
       invalid_token: "Neteisingas prisijungimo raktas."
-      locked: "Jūsų paskyra yra užrakinta."
+      locked: "Paskyra užrakinta."
       timeout: "Sesija baigėsi. Norint tęsti, reikia prisijungti iš naujo."
       unauthenticated: "Norint tęsti, reikia prisijungti arba susikurti paskyrą."
       unconfirmed: "Norint prisijungti, reikia patvirtinti savo paskyrą."
     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: "Neteisingas pakvietimo raktas!"
+      send_instructions: "Pakvietimas išsiųstas."
+      updated: "Slaptažodis pakeistas sėkmingai. Prisijungta."
     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: "Patvirtinti paskyrą"
+        subject: "Patvirtinimo nurodymai"
+        you_can_confirm: "Paskyrą galima patvirtinti žemiau pateikta nuoroda:"
+      hello: "Labas, %{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: "A friend wants you to join Diaspora!"
+        accept: "Priimti pakvietimą"
+        ignore: "Jei nenori priimti pakvietimo, ignoruok šį laišką."
+        no_account_till: "Paskyra nebus sukurta, kol nebus pasinaudota aukščiau esančia nuoroda ir užregistruotas naujas vartotojas."
+        subject: "Draugas nori prisijungti prie Diasporos!"
       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: ", adresu %{url} kurį galima priimti naudojantis žemiau pateikta nuoroda."
+        has_invited_you: "%{name} kviečia prisijungti prie Diasporos"
+        have_invited_you: "%{names} kviečia prisijungti prie Diasporos"
       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: "Keisti slaptažodį"
+        ignore: "Jei tu to neprašei, nekreipk dėmesio į šį laišką."
+        someone_requested: "Kažkas paprašė pakeisti tavo slaptažodį. Tai galima padaryti naudojatis žemiau pateikta nuoroda."
+        subject: "Nurodymai, kaip atstatyti slaptažodį"
+        wont_change: "Slaptažodis liks nepakeistas, kol nebus pasinaudota aukščiau esančia nuoroda ir sukurtas naujas slaptažodis."
       unlock_instructions: 
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
-        click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
-      welcome: "Welcome %{email}!"
+        account_locked: "Paskyra užrakinta dėl per daug bandymų prisijungti."
+        click_to_unlock: "Spustelk šią nuorodą ir paskyra bus atrakinta:"
+        subject: "Nurodymai, kaip atrakinti"
+        unlock: "Atrakinti mano paskyrą"
+      welcome: "Labas, %{email}!"
     passwords: 
       edit: 
-        change_password: "Change my password"
+        change_password: "Keisti mano slaptažodį"
       new: 
-        forgot_password: "Forgot your password?"
-        send_password_instructions: "Send me reset password instructions"
-      send_instructions: "Netrukus gausite el. laišką su nurodymais slaptažodžiui atstatyti."
-      updated: "Slaptažodis pakeistas sėkmingai. Jūs esate prisijungęs."
+        forgot_password: "Pamiršai slaptažodį?"
+        send_password_instructions: "Siųsti nurodymus, kaip atstatyti slaptažodį"
+      send_instructions: "Netrukus gausite el. laišką su nurodymais, kaip atstatyti slaptažodį."
+      updated: "Slaptažodis pakeistas sėkmingai. Prisijungta."
     registrations: 
       destroyed: "Paskyra sėkmingai atšaukta. Iki pasimatymo!"
-      signed_up: "Prisijungta sėkmingai. Jei nustatyta, patvirtinimas išsiųstas į jūsų el. paštą."
+      signed_up: "Prisijungta sėkmingai. Jei nustatyta, patvirtinimas nusiųstas į el. paštą."
       updated: "Paskyra atnaujinta sėkmingai."
     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."
-        have_a_problem: "Have a problem? Find an answer here"
-        login: "Login"
-        modern_browsers: "only supports modern browsers."
-        password: "Password"
-        remember_me: "Remember me"
-        sign_in: "Sign in"
-        username: "Username"
+        alpha_software: "Ši programinė įranga nėra pilnai užbaigta."
+        bugs_and_feedback: "Naudojantis gali pasitaikyti klaidų. Apie pasitaikiusius nesklandumus galima praneštis naudojantis mygtuku naršyklės dešinėje. Klaidas stengsimės ištaisyti kuo skubiau."
+        have_a_problem: "Kyla problemų? Atsakymai čia"
+        login: "Prisijungti"
+        modern_browsers: "palaiko tik modernias naršykles."
+        password: "Slaptažodis"
+        remember_me: "Prisiminti"
+        sign_in: "Prisijungti"
+        username: "Vartotojo vardas"
       signed_in: "Sėkmingai prisijungta."
       signed_out: "Sėkmingai atsijungta."
     shared: 
       links: 
-        forgot_your_password: "Forgot your password?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
-        sign_in: "Sign in"
-        sign_up: "Sign up"
-        sign_up_closed: "Open signups are closed at this time."
+        forgot_your_password: "Pamiršai slaptažodį?"
+        receive_confirmation: "Negavai nurodymų, kaip patvirtinti paskyrą?"
+        receive_unlock: "Negavai nurodymų, kaip atrakinti paskyrą?"
+        sign_in: "Prisijungti"
+        sign_up: "Registruotis"
+        sign_up_closed: "Atviri prisijungimai šiuo metu uždaryti."
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
-      send_instructions: "Netrukus gausite el. laišką su nurodymais paskyros atrakinimui."
-      unlocked: "Paskyra atrakinta. Prisijungėte."
+        resend_unlock: "Siųsti nurodymus, kaip atrakinti, iš naujo"
+      send_instructions: "Netrukus bus išsiųstas el. laiškas su nurodymais, kaip atrakinti paskyrą."
+      unlocked: "Paskyra atrakinta. Prisijungta."
   errors: 
     messages: 
       already_confirmed: "jau patvirtinta"
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index c4c95cb9f..afc6d99b9 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -81,7 +81,7 @@ ru:
         receive_unlock: "Не получили инструкции по разблокированию ?\n"
         sign_in: "Войти"
         sign_up: "Регистрация"
-        sign_up_closed: "Open signups are closed at this time."
+        sign_up_closed: "Открытая регистрация на данный момент не доступна."
     unlocks: 
       new: 
         resend_unlock: "Отправить повторно инструкцию по разблокированию"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 7362838aa..f2912252a 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -29,20 +29,20 @@ de:
     helper: 
       unknown_person: "unbekannte Person"
       youtube_title: 
-        unknown: "Unbekannter Video Titel"
+        unknown: "Unbekannter Video-Titel"
   are_you_sure: "Bist du sicher?"
   aspects: 
     add_to_aspect: 
       failure: "Hinzufügen des Kontaktes zum Aspekt fehlgeschlagen."
       success: "Kontakt erfolgreich zum Aspekt hinzugefügt."
     create: 
-      failure: "Erstellen des Aspekt fehlgeschlagen."
+      failure: "Erstellen des Aspekts fehlgeschlagen."
       success: "Dein neuer Aspekt %{name} wurde erstellt."
     destroy: 
-      success: "%{name} wurde erfolgreich entfernt."
+      success: "Aspekt %{name} wurde erfolgreich entfernt."
     helper: 
-      are_you_sure: "Bist du sicher das du diesen Aspekt löschen möchtest?"
-      aspect_not_empty: "Aspekt ist nicht leer"
+      are_you_sure: "Bist du sicher, dass du diesen Aspekt löschen möchtest?"
+      aspect_not_empty: "Aspekt ist nicht leer."
       remove: "entfernen"
     index: 
       handle_explanation: "Das ist deine Diaspora-Adresse. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer dich kontaktieren können."
@@ -54,7 +54,7 @@ de:
       no_requests: "Keine Anfragen"
       requests: "Anfragen"
     move_contact: 
-      error: "Fehler beim verschieben des Kontaktes: %{inspect}"
+      error: "Fehler beim Verschieben des Kontaktes: %{inspect}"
       failure: "hat nicht geklappt: %{inspect}"
       success: "Person in neuen Aspekt verschoben"
     new_aspect: 
@@ -63,7 +63,7 @@ de:
     no_contacts_message: 
       add_contact: "Einen Kontakt hinzufügen"
       add_contact_to: "Jemanden zu %{aspect_name} hinzufügen"
-      invite: "Jemanden einladen an Diaspora teilzunehmen!"
+      invite: "Jemanden einladen, an Diaspora teilzunehmen!"
       nobody: "Du kennst bestimmt jemanden — hole ihn zu Diaspora!"
       nobody_in_aspect: "Dein Aspekt %{aspect_name} ist leer."
     no_posts_message: 
@@ -96,15 +96,15 @@ de:
   home: 
     show: 
       already_account: "bereits registriert?"
-      choice: "Choice"
-      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."
+      choice: "Wahl"
+      choice_explanation: "Diaspora ermöglicht es dir, deine Kontakte in sogenannten Aspekten zu verwalten. Das Einzigartige an Diaspora ist, dass du mit Aspekten kontrollieren kannst, mit welchen Menschen du deine Fotos, Geschichten und Witze teilst."
       learn_about_host: "Erfahre, wie du deinen eigenen Diaspora-Server betreiben kannst."
       login_here: "hier anmelden"
-      ownership: "Ownership"
-      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."
+      ownership: "Eigentum"
+      ownership_explanation: "Deine Bilder gehören dir und du solltest das nicht aufgeben müssen, um sie zu teilen. Bei Diaspora gehört dein Bild immer dir und du hast die volle Kontrolle, wie es vervielfältigt wird."
       share_what_you_want: "Teile was du willst, mit wem du willst."
-      simplicity: "Simplicity"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
+      simplicity: "Unkompliziertheit"
+      simplicity_explanation: "Diaspora macht das teilen sauber und einfach - das gilt ganz besonders für deine Privatsphäre. Diaspora ist von sich aus privat; es gibt deswegen gibt es keine komplizierten Einstellungen um dein Profil sicher zu machen."
   invitations: 
     check_token: 
       not_found: "Einladungstoken nicht gefunden"
@@ -155,10 +155,10 @@ de:
     edit: 
       allow_search: "Erlaube anderen Diaspora-Nutzern nach dir zu suchen"
       first_name: "Vorname"
-      info_available_to: "Diese Infos werden für alle verfügbar sein mit denen du bei Diaspora verbunden bist."
+      info_available_to: "Diese Infos werden für alle verfügbar sein, mit denen du bei Diaspora verbunden bist."
       last_name: "Nachname"
       update_profile: "Profil aktualisieren"
-      your_bio: "Deine Info"
+      your_bio: "Deine Infos"
       your_birthday: "Dein Geburtstag"
       your_gender: "Dein Geschlecht"
       your_name: "Dein Name"
@@ -178,7 +178,7 @@ de:
       or_select_one: "oder wähle eins von deinen existierenden"
     profile_sidebar: 
       bio: "Info"
-      born: "Geboren"
+      born: "Geboren am"
       cannot_remove: "%{name} kann nicht aus dem letzten Aspekt entfernt werden."
       edit_my_profile: "Profil bearbeiten"
       gender: "Geschlecht"
@@ -196,9 +196,9 @@ de:
       updated: "Profil aktualisiert"
   photos: 
     create: 
-      integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher das es ein Foto war?"
-      runtime_error: "Der Server wollte das Foto nicht bearbeiten, bist du darauf zu sehen?"
-      type_error: "Hochladen des Foto fehlgeschlagen. Du solltest hier nur FOTOS hochladen..."
+      integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass es ein Foto war?"
+      runtime_error: "Der Server wollte das Foto nicht bearbeiten; bist du darauf zu sehen?"
+      type_error: "Hochladen des Fotos fehlgeschlagen. Du solltest hier nur FOTOS hochladen..."
     destroy: 
       notice: "Foto gelöscht."
     edit: 
@@ -216,11 +216,11 @@ de:
     show: 
       delete_photo: "Foto löschen"
       edit: "Bearbeiten"
-      edit_delete_photo: "Fotobeschreibung bearbeiten  / Foto löschen"
+      edit_delete_photo: "Fotobeschreibung bearbeiten / Foto löschen"
       make_profile_photo: "Zum Profilbild machen"
       original_post: "Ursprüngliche Nachricht"
       update_photo: "Foto aktualisieren"
-      view: "view"
+      view: "Anzeigen"
     update: 
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
@@ -238,15 +238,15 @@ de:
       update: "Aktualisieren"
     new: 
       sign_up: "Registrieren"
-      sign_up_for_diaspora: "Ein Diaspora Konto anlegen"
+      sign_up_for_diaspora: "Ein Diaspora-Konto anlegen"
   requests: 
     create: 
-      sending: "Am senden..."
-      sent: "Du möchtest mit %{name} teilen. Sie sollten es beim nächsten anmelden bei Diaspora sehen."
+      sending: "Senden..."
+      sent: "Du möchtest mit %{name} teilen. Sie sollten es beim nächsten Anmelden bei Diaspora sehen."
     destroy: 
       error: "Bitte wähle einen Aspekt!"
       ignore: "Anfrage des Kontaktes ignoriert."
-      success: "Ihr seit jetzt verbunden."
+      success: "Ihr seid jetzt verbunden."
     manage_aspect_contacts: 
       existing: "Existierende Kontakte"
       manage_within: "Kontakte verwalten in"
@@ -270,14 +270,14 @@ de:
       create_request: "Über Diaspora-Adresse finden"
       diaspora_handle: "Diaspora-Adresse"
       enter_a_diaspora_username: "Gib eine Diaspora-Adresse ein:"
-      know_email: "Know their email address? You should invite them"
+      know_email: "Du kennst ihre E-Mail-Adressen? Dann solltest du sie einladen"
       your_diaspora_username_is: "Deine Diaspora-Adresse ist: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "Aspekt hinzufügen"
       add_existing: "Existierenden Kontakt hinzufügen"
       add_to: "Zu %{aspect} hinzufügen"
       all_contacts: "Alle Kontakte"
-      aspect_settings: "Aspect settings"
+      aspect_settings: "Aspekt-Einstellungen"
       aspects: "Aspekte"
       confirm_remove_aspect: "Aspekt löschen?"
       contacts: "Kontakte"
@@ -314,13 +314,13 @@ de:
     reshare: 
       reshare: "Erneut senden an"
     stream_element: 
-      show_comments: "Zeige Kommentare"
+      show_comments: "Kommentare anzeigen"
   status_messages: 
     helper: 
-      no_message_to_display: "Keine Nachricht zum anzeigen."
+      no_message_to_display: "Keine Nachricht zum Anzeigen."
     new_status_message: 
       oh_yeah: "oh yeah!"
-      tell_me_something_good: "Was gibt es neues?"
+      tell_me_something_good: "Was gibt es Neues?"
     show: 
       destroy: "Entfernen"
   the_world: "die Welt"
@@ -348,7 +348,7 @@ de:
       step_2: 
         add: "Hinzufügen"
         aspect_name: "Name des Aspekts"
-        description: "Sage Diaspora welche verschiedenen Aspekte von dir von verschiedenen Kontakten gesehen werden sollen. Du kannst diese später verwalten in dem du auf Verwalten oben rechts klickst. Deine Aspekte sind nur für dich und nicht für andere sichtbar."
+        description: "Sage Diaspora welche verschiedenen Aspekte von dir von verschiedenen Kontakten gesehen werden sollen. Du kannst diese später verwalten, indem du auf Verwalten oben rechts klickst. Deine Aspekte sind nur für dich und nicht für Andere sichtbar."
         your_aspects: "Deine Aspekte"
       step_3: 
         description: "Du kannst deine gewohnten sozialen Netzwerke mit deinem Diaspora-Konto verbinden. Du kannst auch deine Nachrichten außerhalb von Diaspora veröffentlichen, wenn du 'öffentlich machen' auswählst."
@@ -358,9 +358,9 @@ de:
         continue: "Fahre fort um auf deine \"Alle\" Seite zu kommen, eine Übersicht über alle deiner Aspekte."
         finish: "Fertigstellen"
         manage_aspects: "Du kannst auch Kontakte auf jeder der Aspekt-Seiten hinzufügen."
-        ready_to_share: "Du bist nun bereit zum teilen mit"
-        set_up: "Du bist nun bereit %{name}!"
-        user_menu: "in deinem Benutzer-Menü klickst (oben rechts)."
+        ready_to_share: "Du bist nun bereit zum Teilen mit"
+        set_up: "Du bist nun bereit, %{name}!"
+        user_menu: "das Benutzer-Menü welches sich oben rechts befindet."
       welcome: "Willkommen bei Diaspora!"
     public: 
       does_not_exist: "Benutzer %{username} existiert nicht!"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 1345728a1..b8d4d99b7 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -4,9 +4,9 @@
 
 
 es: 
-  _comments: "Comments"
-  _home: "Home"
-  _photos: "Fotos"
+  _comments: "Comentarios"
+  _home: "Inicio"
+  _photos: "fotos"
   _services: "Servicios"
   account: "Cuenta"
   activemodel: 
@@ -19,42 +19,42 @@ es:
         user: 
           attributes: 
             email: 
-              taken: "is already taken"
+              taken: "Ya ha sido elegido"
             person: 
               invalid: "no es válido"
             username: 
-              taken: "is already taken"
+              taken: "Ya ha sido elegido"
   ago: "hace"
   application: 
     helper: 
       unknown_person: "persona desconocida"
       youtube_title: 
-        unknown: "Título desconocido de video"
+        unknown: "Título Desconocido de Vídeo"
   are_you_sure: "¿Estás seguro?"
   aspects: 
     add_to_aspect: 
-      failure: "No se ha podido agregar un amigo a un aspecto."
-      success: "Se ha agregado correctamente su amigo a un aspecto."
+      failure: "Error al añadir el contacto a este aspecto."
+      success: "Se ha agregado correctamente su contacto a un aspecto."
     create: 
       failure: "Creación de aspecto fallida."
-      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+      success: "Tu nuevo aspecto %{name} ha sido creado"
     destroy: 
-      success: "%{name} fue eliminado exitosamente."
+      success: "%{name} fue eliminado correctamente."
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspecto no vacio"
+      are_you_sure: "¿Seguro que deseas eliminar este aspecto?"
+      aspect_not_empty: "Aspecto no vacío"
       remove: "eliminar"
     index: 
-      handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de email, puedes dársela a gente para que te encuentren"
     manage: 
       add_a_new_aspect: "Añadir un nuevo aspecto"
       add_a_new_contact: "Añadir un nuevo Contacto"
-      drag_to_add: "Arrastre para agregar personas"
+      drag_to_add: "Arrastra para agregar personas"
       manage_aspects: "Gestionar aspectos"
       no_requests: "No hay nuevas peticiones"
       requests: "Peticiones"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
+      error: "Error al mover el contacto: %{inspect}"
       failure: "error %{inspect}"
       success: "Persona movida a un nuevo perfil"
     new_aspect: 
@@ -63,24 +63,24 @@ es:
     no_contacts_message: 
       add_contact: "Añadir un contacto"
       add_contact_to: "Añadir a alguien a %{aspect_name}"
-      invite: "Invita a otros a unirse a Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
+      invite: "¡Invita a otros a unirse a Diaspora!"
+      nobody: "Sabemos que conoces gente — ¡traelos a Diaspora!"
       nobody_in_aspect: "Tu aspecto '%{aspect_name}' esta vacío."
     no_posts_message: 
-      start_talking: "Nadie ha dicho nada todavía. ¡Inicia la conversación!"
+      start_talking: "Nadie ha dicho nada todavía ¡Inicia la conversación!"
     remove_from_aspect: 
-      failure: "No se ha podido eliminar a la persona del perfil."
-      success: "Persona eliminada del perfil con éxito"
+      failure: "No se ha podido eliminar a la persona del aspecto."
+      success: "Persona eliminada del aspecto correctamente"
     seed: 
       family: "Familia"
       work: "Trabajo"
     show: 
-      contact: "contact"
-      contacts: "contacts"
-      edit_aspect: "edit aspect"
+      contact: "contacto"
+      contacts: "contactos"
+      edit_aspect: "editar aspecto"
     update: 
-      success: "Su aspecto, %{name}, fue editado exitosamente."
-  back: "Atras"
+      success: "Tu aspecto, %{name}, fue editado correctamente."
+  back: "Atrás"
   cancel: "Cancelar"
   comments: 
     new_comment: 
@@ -90,35 +90,35 @@ es:
   email: "Correo electrónico"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Corrija los siguentes errores e intente de nuevo."
-      invalid_fields: "Campos Invalidos"
-  fill_me_out: "Llename"
+      correct_the_following_errors_and_try_again: "Corrija los siguentes errores e inténtelo de nuevo."
+      invalid_fields: "Campos Inválidos"
+  fill_me_out: "Complétame"
   home: 
     show: 
-      already_account: "already have an account?"
-      choice: "Choice"
-      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_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"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
+      already_account: "¿Todavía no dispones de una cuenta?"
+      choice: "Escoger"
+      choice_explanation: "Diaspora te permite organizar conexiones en grupos llamados Aspectos. Sólo en Diaspora, los aspectos aseguran que tus fotos, historias y bromas son compartidas sólo con la gente que tu quieras."
+      learn_about_host: "Aprende acerca de cómo hostear tu propio servidor Diaspora."
+      login_here: "Ingrese aquí"
+      ownership: "Propiedad"
+      ownership_explanation: "Eres dueño de tus imágenes, y nadie debería tener que cederlas sólo para compartirlas. Tú mantienes la propiedad sobre todo lo que compartas en Diaspora, dándote control total sobre lo que es distribuido."
+      share_what_you_want: "Comparte lo que quieras, con quien quieras"
+      simplicity: "Simplicidad"
+      simplicity_explanation: "Diaspora hace que compartir sea transparente y fácil - y esto va por privacidad también. Inherente mente privado, Diaspora no te hace caminar a través de configuraciones y opciones solo para mantener tu perfil seguro."
   invitations: 
     check_token: 
-      not_found: "Ficha de invitación no encontrada."
+      not_found: "Identificación de invitación no encontrada."
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "Ya ha invitado a esta persona."
-      no_more: "No tiene más invitaciones."
-      rejected: "The following email addresses had problems: "
-      sent: "Tu invitación ha sido enviada."
+      already_contacts: "Ya estas en contacto con esta persona"
+      already_sent: "Ya has invitado a esta persona."
+      no_more: "No tienes más invitaciones."
+      rejected: "Las siguientes direcciones de email han tendido problemas"
+      sent: "Tu invitación ha sido enviada a:"
     edit: 
       sign_up: "conectarse"
     new: 
-      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"
+      comma_seperated_plz: "Puedes escribir múltiples direcciones de email separadas por comas."
+      if_they_accept_info: "si aceptan, serán añadidos al aspecto al que lo hayas invitado."
       invite_someone_to_join: "¡Invitar a alguien a unirse a Diaspora!"
       message: "Mensaje:"
       send_an_invitation: "Enviar una invitación"
@@ -126,46 +126,46 @@ es:
       to: "Para"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "IMPULSADO POR DIASPORA*"
     header: 
       account_settings: "configurar cuenta"
-      blog: "blog"
+      blog: "Blog"
       edit_profile: "editar perfil"
-      login: "login"
+      login: "ingresar"
       logout: "desconectarse"
       view_profile: "ver perfil"
   notifier: 
-    diaspora: "Correo robot de Diáspora"
-    hello: "Hola %{name}!"
+    diaspora: "Correo robot de Diaspora"
+    hello: "¡Hola %{name}!"
     love: "cariño,"
     new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "Regístrate aquí"
+      just_sent_you: "acaban de enviarte una solicitud de contacto en Diaspora*"
+      sign_in: "regístrate aquí"
       subject: "nueva petición de contacto de Diaspora* de %{from}"
-      try_it_out: "Debería pensar en corregirlo."
+      try_it_out: "Deberías pensar en corregirlo."
     request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      aspect: "perfil."
-      subject: "%{name} has accepted your friend request on Diaspora*"
+      accepted: "ha aceptado tu petición de contacto. Ahora se encuentran en tu"
+      aspect: "aspecto."
+      subject: "%{name} ha aceptado tu petición de contacto en Diaspora*"
   ok: "OK"
   or: "o"
   password: "Contraseña"
   password_confirmation: "Confirmación de contraseña"
   people: 
     edit: 
-      allow_search: "Permitir que la gente te busque"
+      allow_search: "Permitir que la gente te busque en Diaspora"
       first_name: "Nombre"
-      info_available_to: "Esta información estará disponible para cualquiera que se conecte en Diáspora."
+      info_available_to: "Esta información estará disponible para cualquiera que se conecte a Diaspora."
       last_name: "Apellido"
       update_profile: "Actualizar perfil"
-      your_bio: "Su biografía"
+      your_bio: "Tu biografía"
       your_birthday: "Tu cumpleaños"
-      your_gender: "Su género"
+      your_gender: "Tu sexo"
       your_name: "Tu nombre"
-      your_photo: "Su fotografía"
-      your_profile: "Su perfil"
+      your_photo: "Tu fotografía"
+      your_profile: "Tu perfil"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
+      people_on_pod_are_aware_of: "gente en el \"pod\" son conscientes de"
       results_for: "resultados para %{params}"
     index: 
       results_for: "resultados de la búsqueda para"
@@ -173,89 +173,89 @@ es:
       add_contact: "añadir contacto"
       already_connected: "Ya está conectado"
       pending_request: "petición pendiente"
-      thats_you: "eres tu!"
+      thats_you: "¡Ese eres tú!"
     profile_photo_upload: 
-      or_select_one: "o seleccione uno de los que ya existen"
+      or_select_one: "o selecciona uno de los que ya existen"
     profile_sidebar: 
-      bio: "bio"
-      born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
+      bio: "biografía"
+      born: "nacido"
+      cannot_remove: "No se puede eliminar a %{name} del ultimo aspecto."
       edit_my_profile: "Modificar mi perfil"
-      gender: "gender"
-      in_aspects: "in aspects"
-      remove_contact: "remover contacto"
+      gender: "sexo"
+      in_aspects: "en aspectos"
+      remove_contact: "eliminar contacto"
       remove_from: "Eliminar a %{name} de %{aspect}?"
     show: 
-      already_requested: "Usted ya ha enviado una solicitud a %{name}."
-      does_not_exist: "El usuario no existe!"
-      no_posts: "no hay publicaciones que mostrar!"
-      not_connected: "No estas conectado con esta persona"
-      request_people: "Si lo desea, puede solicitarle la colocación en uno de sus aspectos."
+      already_requested: "Ya has enviado una solicitud a %{name}."
+      does_not_exist: "¡El usuario no existe!"
+      no_posts: "¡No hay publicaciones que mostrar!"
+      not_connected: "No estás conectado con esta persona"
+      request_people: "Si lo deseas, puedes solicitarle la colocación en uno de tus aspectos."
     update: 
       failed: "No se pudo actualizar el perfil"
       updated: "Perfil actualizado"
   photos: 
     create: 
-      integrity_error: "La subida de la foto ha fallado.  ¿Está seguro de que era una imagen?"
-      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-      type_error: "La subida de la foto ha fallado.  ¿Está seguro de que una imagen fue añadida?"
+      integrity_error: "La subida de la foto ha fallado. ¿Estás seguro de que era una imagen?"
+      runtime_error: "La carga de fotos ha fallado. ¿Estás seguro de que tienes puesto el cinturón de seguridad?"
+      type_error: "La subida de la foto ha fallado.  ¿Estás seguro de que se añadió alguna imagen?"
     destroy: 
       notice: "Foto eliminada."
     edit: 
       editing: "Editando"
     new: 
-      back_to_list: "Volver a la lista"
+      back_to_list: "Volver a la Lista"
       new_photo: "Nueva Foto"
-      post_it: "post it!"
+      post_it: "¡Postéalo!"
     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}."
+      empty: "{file} está vacío, por favor seleccione los archivos sin este último."
+      invalid_ext: "{file} tiene una extensión invalida. Sólo {extensions} están permitidas."
+      size_error: "{file} es demasiado largo, el tamaño máximo por archivo es de {sizeLimit}."
     photo: 
-      view_all: "Mirar todas las fotos de %{name}"
+      view_all: "ver todas las fotos de %{name}"
     show: 
       delete_photo: "Eliminar Foto"
-      edit: "edit"
+      edit: "editar"
       edit_delete_photo: "Editar pie de fotografía / eliminar fotografía"
       make_profile_photo: "convertir en foto de perfil"
-      original_post: "Original Post"
+      original_post: "Post original"
       update_photo: "Actualizar Foto"
-      view: "view"
+      view: "vista"
     update: 
       error: "Falló la edición de la foto."
-      notice: "Foto actualizada satisfactoriamente."
+      notice: "Foto actualizada correctamente."
   profile: "Perfil"
   registrations: 
-    closed: "Registros están cerrados en este servidor Diaspora"
+    closed: "Los registros están cerrados en este servidor Diaspora"
     create: 
-      success: "Se ha unido a Diaspora!"
+      success: "¡Te has unido a Diaspora!"
     edit: 
-      cancel_my_account: "Cancel my account"
-      edit: "Edit %{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)"
-      unhappy: "Unhappy?"
-      update: "Update"
+      cancel_my_account: "Eliminar mi cuenta"
+      edit: "Editar %{name}"
+      leave_blank: "(déjalo en blanco si no quieres cambiarlo)"
+      password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
+      unhappy: "¿Triste?"
+      update: "Actualizar"
     new: 
       sign_up: "Regístrate"
-      sign_up_for_diaspora: "Registrate en Diaspora"
+      sign_up_for_diaspora: "Regístrate en Diaspora"
   requests: 
     create: 
-      sending: "Sending..."
-      sent: "Has solicitado compartir con %{name}. Ellos deberían verlo la próxima vez que se conecten a Diaspora."
+      sending: "Enviando..."
+      sent: "Has solicitado compartir con %{name}. Deberían verlo la próxima vez que se conecten a Diaspora."
     destroy: 
-      error: "Seleccione un aspecto!"
-      ignore: "Ignorar peticion de amistad"
+      error: "¡Selecciona un aspecto!"
+      ignore: "Petición de contacto ignorada."
       success: "Ahora son amigos."
     manage_aspect_contacts: 
-      existing: "Existing contacts"
-      manage_within: "Manage contacts within"
+      existing: "Contactos existentes"
+      manage_within: "Gestione los contactos en"
     new_request_to_person: 
-      sent: "enviado!"
+      sent: "¡enviado!"
   search: "Buscar"
   services: 
     create: 
-      success: "Autenticación exitosa."
+      success: "Autenticación correcta."
     destroy: 
       success: "Autenticación destruida con éxito."
     index: 
@@ -263,35 +263,35 @@ es:
       connect_to_twitter: "Conectar a twitter"
       disconnect: "desconectar"
       logged_in_as: "registrado como"
-      really_disconnect: "desconectar %{service}?"
+      really_disconnect: "¿desconectar %{service}?"
   settings: "Configuración"
   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"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      create_request: "Buscar por la dirección Diaspora"
+      diaspora_handle: "Dirección Diaspora"
+      enter_a_diaspora_username: "Introduzca su nombre de usuario Diaspora:"
+      know_email: "Sabes su dirección de email? Deberías invitarlos"
+      your_diaspora_username_is: "Su nombre de usuario Diaspora es: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "agregar aspecto"
       add_existing: "Añadir un contacto existente"
       add_to: "añadir a %{aspect}"
-      all_contacts: "All contacts"
-      aspect_settings: "Configuración de Aspecto"
+      all_contacts: "Todos los contactos"
+      aspect_settings: "Configuración de aspecto"
       aspects: "Aspectos"
       confirm_remove_aspect: "Remover aspecto?"
       contacts: "contactos"
       done_editing: "editado"
       invites: "Invitaciones"
-      new_request: "%{count} nueva petición!"
-      new_requests: "%{count} nuevas peticiones!"
+      new_request: "%¡{count} nueva petición!"
+      new_requests: "%¡{count} nuevas peticiones!"
       no_contacts: "Actualmente no tienes contactos. Búscalos aquí."
-      remove_aspect: "Remover Aspecto"
+      remove_aspect: "Eliminar aspecto"
     contact_list: 
-      cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
+      cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
+      search_contacts: "Buscar contactos"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
+      dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
       invitations_left: "(quedan %{count})"
       invite_someone: "Invita a alguien"
     notification: 
@@ -300,7 +300,7 @@ es:
       logged_in: "conectar a %{service}"
       manage: "gestión de los servicios conectados"
       outside: "Los mensajes públicos estarán disponibles para que otros usuarios de Diaspora los puedan ver."
-      title: "Está a punto de publicar un mensaje!"
+      title: "¡Estás a punto de publicar un mensaje!"
     publisher: 
       add_photos: "añadir fotografías"
       all: "todo"
@@ -319,53 +319,53 @@ es:
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
     new_status_message: 
-      oh_yeah: "oh yeah!"
+      oh_yeah: "¡Oh sí!"
       tell_me_something_good: "dime algo bueno"
     show: 
-      destroy: "Borrar"
+      destroy: "Destruir"
   the_world: "el mundo"
   username: "Nombre de usuario"
   users: 
     destroy: "Cuenta cerrada con éxito."
     edit: 
-      change_language: "Cambiar Idioma"
-      change_password: "Cambiar Contraseña"
-      close_account: "Cerrar Cuenta"
+      change_language: "Cambiar idioma"
+      change_password: "Cambiar contraseña"
+      close_account: "Cerrar cuenta"
       download_photos: "descargar mis fotos"
       download_xml: "descargar mi xml"
-      export_data: "Exportar Datos"
-      new_password: "Nueva Contraseña"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      export_data: "Exportar datos"
+      new_password: "Nueva contraseña"
+      your_email: "Tu email"
+      your_handle: "Tu dirección Diaspora"
     getting_started: 
-      connect_services: "Connect your services"
-      define_aspects: "Defina sus aspectos"
+      connect_services: "Conectar a otros servicios"
+      define_aspects: "Define tus aspectos"
       edit_profile: "Editar tu perfil"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
-      signup_steps: "Complete su inscripción haciendo estas cosas:"
-      skip: "skip getting started"
+      finished: "Finalizado!"
+      save_and_continue: "Guardar y continuar"
+      signup_steps: "Completa tu inscripción completando estos tres pasos:"
+      skip: "saltarse la configuración inicial"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        your_aspects: "Your aspects"
+        add: "Añadir"
+        aspect_name: "Nombre del aspecto"
+        description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
+        your_aspects: "Tus aspectos"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
+        description: "Puedes conectar tus redes sociales existentes con tu cuenta Diaspora. Podrás realizar posts públicos desde tu Inicio cuando selecciones \"hacer público\""
+        your_services: "Tus servicios"
       step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
-        finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
-      welcome: "Welcome to Diaspora!"
+        change_profile: "Puedes editar tu perfil y configurar tus servicios conectados en cualquier momento."
+        continue: "Continúa en tu página de Inicio, un resumen de todos tus aspectos."
+        finish: "Finalizar"
+        manage_aspects: "También puedes agregar varios contactos al mismo tiempo en una página de aspecto."
+        ready_to_share: "Ya puedes comenzar a compartir con"
+        set_up: "Ya estás listo, %{name}!"
+        user_menu: "el menú de usuario está localizado arriba a la derecha."
+      welcome: "¡Bienvenido a Diaspora!"
     public: 
       does_not_exist: "¡El usuario %{username} no existe!"
     update: 
       language_changed: "Idioma Cambiado"
-      language_not_changed: "Cambio de idioma fallido"
-      password_changed: "Contraseña cambiada"
-      password_not_changed: "Cambio de contraseña fallido"
+      language_not_changed: "Cambio de Idioma Fallido"
+      password_changed: "Contraseña Cambiada"
+      password_not_changed: "Cambio de Contraseña Fallido"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 473ac5523..410a08b78 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -4,368 +4,368 @@
 
 
 lt: 
-  _comments: "Comments"
-  _home: "Home"
-  _photos: "photos"
-  _services: "Services"
-  account: "Account"
+  _comments: "Komentarai"
+  _home: "Pradžia"
+  _photos: "Nuotraukos"
+  _services: "Paslaugos"
+  account: "Paskyra"
   activemodel: 
     errors: 
       models: 
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken"
+              taken: "jau užimtas"
         user: 
           attributes: 
             email: 
-              taken: "is already taken"
+              taken: "jau užimtas"
             person: 
-              invalid: "is invalid"
+              invalid: "negalioja"
             username: 
-              taken: "is already taken"
-  ago: "ago"
+              taken: "užimtas"
+  ago: "prieš"
   application: 
     helper: 
-      unknown_person: "unknown person"
+      unknown_person: "nežinomas asmuo"
       youtube_title: 
-        unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+        unknown: "Nežinomas video pavadinimas"
+  are_you_sure: "Ar tikrai?"
   aspects: 
     add_to_aspect: 
-      failure: "Failed to add friend to aspect."
-      success: "Successfully added friend to aspect."
+      failure: "Nepavyko pridėti draugo į aspektą."
+      success: "Draugas į aspektą pridėtas sėkmingai."
     create: 
-      failure: "Aspect creation failed."
-      success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+      failure: "Aspekto sukurti nepavyko."
+      success: "Spustelk pliusą kairėje ir nurodyk, kas Diasporoje gali matyti tavo naują aspektą."
     destroy: 
-      success: "%{name} was successfully removed."
+      success: "%{name} sėkmingai pašalintas."
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspect not empty"
-      remove: "remove"
+      are_you_sure: "Ar tikrai šalinti aspektą?"
+      aspect_not_empty: "Aspektas netuščias"
+      remove: "šalinti"
     index: 
-      handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
+      handle_explanation: "Tai tavo vartotojo vardas Diasporoje. Kaip ir el. pašto adresas, jis leidžia sistemoje rasti pažįstamus."
     manage: 
-      add_a_new_aspect: "Add a new aspect"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
+      add_a_new_aspect: "Pridėti naują aspektą"
+      add_a_new_contact: "Pridėti naują kontaktą"
+      drag_to_add: "Pridėk žmones tempdamas juos pele"
+      manage_aspects: "Tvarkyti aspektus"
+      no_requests: "Nėra naujų aspektų"
+      requests: "Prašymai"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
-      failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      error: "Klaida perkeliant kontaktą: %{inspect}"
+      failure: "nepavyko %{inspect}"
+      success: "Kontaktas perkeltas į aspektą"
     new_aspect: 
-      create: "Create"
-      name: "Name"
+      create: "Sukurti"
+      name: "Pavadinimas"
     no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+      add_contact: "Pridėti kontaktą"
+      add_contact_to: "Pridėti kontaktą į aspektą \"%{aspect_name}\""
+      invite: "Pakviesk į Diasporą!"
+      nobody: "Žinome, kad pažįsti daug žmonių - pakviesk juos į Diasporą!"
+      nobody_in_aspect: "Aspektas \"%{aspect_name}\" tuščias."
     no_posts_message: 
-      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+      start_talking: "Dar niekas nepasisakė. Pradėk pokalbį pats!"
     remove_from_aspect: 
-      failure: "Failed to remove person from aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Nepavyko pašalinti asmens iš aspekto"
+      success: "Asmuo pašalintas iš aspekto sėkmingai!"
     seed: 
-      family: "Family"
-      work: "Work"
+      family: "Šeima"
+      work: "Darbas"
     show: 
-      contact: "contact"
-      contacts: "contacts"
-      edit_aspect: "edit aspect"
+      contact: "kontaktas"
+      contacts: "kontaktai"
+      edit_aspect: "keisti aspektą"
     update: 
-      success: "Your aspect, %{name}, has been successfully edited."
-  back: "Back"
-  cancel: "Cancel"
+      success: "Aspektas \"%{name}\" pakeistas sėkmingai."
+  back: "Atgal"
+  cancel: "Atšaukti"
   comments: 
     new_comment: 
-      comment: "Comment"
-      commenting: "Commenting..."
-  delete: "Delete"
-  email: "Email"
+      comment: "Komentuoti"
+      commenting: "Siunčiamas komentaras..."
+  delete: "Šalinti"
+  email: "El. paštas"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
-      invalid_fields: "Invalid Fields"
-  fill_me_out: "Fill me out"
+      correct_the_following_errors_and_try_again: "Ištaisyk šias klaidas ir bandyk vėl."
+      invalid_fields: "Neteisingi laukai"
+  fill_me_out: "Užpildyk"
   home: 
     show: 
-      already_account: "already have an account?"
-      choice: "Choice"
-      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_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"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
+      already_account: "jau turi paskyrą?"
+      choice: "Pasirinkimas"
+      choice_explanation: "Diaspora tau leidžia tvarkyti susijungimus naudojant vadinamuosius aspektus. Unikaliai Diasporai, aspektai garantuoja, kad tavo nuotraukos, istorijos ir pokštai yra prieinamos tik žmonėms, kuriuos tu pasirinkai."
+      learn_about_host: "Sužinok, kaip paleisti savo paties Diasporos serverį"
+      login_here: "prisijunk čia"
+      ownership: "Nuosavybė"
+      ownership_explanation: "Tau priklauso tavo nuotraukos, ir tu neturėtum atsisakyti nuosavybės vien dėl to, kad jomis pasidalinai. Tau priklauso viskas, kuo daliniesi Diasporoje. Tai duoda tau visišką platinimo kontrolę."
+      share_what_you_want: "Dalykis, kuo tik nori, su kuo tik nori."
+      simplicity: "Paprastumas"
+      simplicity_explanation: "Diaspora supaprastina ir palengvina dalijimąsi - tas pats dar dvigubai labiau privatumui. Iš prigimties privati, Diaspora neturi nustatymų ir pasirinkimų puslapių, kuriuos tau tektų perbristi, norint profilį turėti saugų ir pagal tavo skonį."
   invitations: 
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "Pakvietimo raktas nerastas"
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
-      rejected: "The following email addresses had problems: "
-      sent: "Your invitation has been sent."
+      already_contacts: "Jau esi susijungęs su šiuo asmeniu"
+      already_sent: "Jau pakvietei šį asmenį."
+      no_more: "Daugiau pakvietimų neturi."
+      rejected: "Šie el. pašto adresai neveikė: "
+      sent: "Pakvietimas išsiųstas."
     edit: 
-      sign_up: "sign_up"
+      sign_up: "Prisijungti"
     new: 
-      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: "Invite someone to join Diaspora!"
-      message: "Message:"
-      send_an_invitation: "Send an invitation"
-      send_invitation: "Send invitation"
-      to: "To"
+      comma_seperated_plz: "Keletą el. pašto adresų gali įvesti atskirdamas juos kableliais."
+      if_they_accept_info: "jei jie sutiks, jie bus pridėti prie tavo pasirinkto aspekto"
+      invite_someone_to_join: "Pakviesk ką nors prisijungti prie Diasporos!"
+      message: "Žinutė:"
+      send_an_invitation: "Nusiųsk kvietimą"
+      send_invitation: "Siųsti kvietimą"
+      to: "Kam"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "TINKLAPĮ LEIDŽIA DIASPORA*"
     header: 
-      account_settings: "account settings"
-      blog: "blog"
-      edit_profile: "edit profile"
-      login: "login"
-      logout: "logout"
-      view_profile: "view profile"
+      account_settings: "paskyros nustatymai"
+      blog: "blog'as"
+      edit_profile: "keisti profilį"
+      login: "prisijungti"
+      logout: "atsijungti"
+      view_profile: "peržiūrėti profilį"
   notifier: 
-    diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
-    love: "love,"
+    diaspora: "Diasporos pašto robotas"
+    hello: "Labas, %{name}!"
+    love: "su meile,"
     new_request: 
-      just_sent_you: "just sent you a friend request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      just_sent_you: "tavęs ką tik paprašė priimti į draugus Diasporoje*"
+      sign_in: "prisijungimas čia"
+      subject: "naujas prašymas priimti į Diasporos* draugus iš %{from}"
+      try_it_out: "Pabandyk!"
     request_accepted: 
-      accepted: "has accepted your friend request. They are now in your"
-      aspect: "aspect."
-      subject: "%{name} has accepted your friend request on Diaspora*"
-  ok: "OK"
-  or: "or"
-  password: "Password"
-  password_confirmation: "Password confirmation"
+      accepted: "priėmė tavo prašymą draugauti. Jie dabar yra tavo"
+      aspect: "aspektas."
+      subject: "%{name} priėmė tavo pasiūlymą draugauti Diasporoje*"
+  ok: "gerai"
+  or: "arba"
+  password: "Slaptažodis"
+  password_confirmation: "Slaptažodžio patvirtinimas"
   people: 
     edit: 
-      allow_search: "Allow for people to search for you"
-      first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_profile: "Your profile"
+      allow_search: "Leisti kitiems tavęs ieškoti"
+      first_name: "Vardas"
+      info_available_to: "Ši informacija bus prieinama visiems tavo Diasporos kontaktams."
+      last_name: "Pavardė"
+      update_profile: "Atnaujinti profilį"
+      your_bio: "Tavo bio"
+      your_birthday: "Tavo gimtadienis"
+      your_gender: "Tavo lytis"
+      your_name: "Tavo slapyvardis"
+      your_photo: "Tavo nuotrauka"
+      your_profile: "Tavo profilis"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      people_on_pod_are_aware_of: " žmonės serveryje žino"
+      results_for: " \"%{params}\" rezultatai"
     index: 
-      results_for: "search results for"
+      results_for: "ieškoti rezultatų pagal"
     person: 
-      add_contact: "add contact"
-      already_connected: "Already connected"
-      pending_request: "pending request"
-      thats_you: "thats you!"
+      add_contact: "pridėti kontaktą"
+      already_connected: "Jau prisijungtas"
+      pending_request: "laukiamas prašymas"
+      thats_you: "tai tu!"
     profile_photo_upload: 
-      or_select_one: "or select one from your already existing"
+      or_select_one: "arba pasirink vieną iš tavo jau egzistuojančių"
     profile_sidebar: 
       bio: "bio"
-      born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
-      edit_my_profile: "Edit my profile"
-      gender: "gender"
-      in_aspects: "in aspects"
-      remove_contact: "remove contact"
-      remove_from: "Remove %{name} from %{aspect}?"
+      born: "gimimo data"
+      cannot_remove: "Iš paskutinio aspekto vartotojo \"%{name}\" pašalinti negalima."
+      edit_my_profile: "Redaguoti mano profilį"
+      gender: "lytis"
+      in_aspects: "aspektuose"
+      remove_contact: "pašalinti kontaktą"
+      remove_from: "Ar pašalinti kontaktą \"%{name}\" iš aspekto \"%{aspect}\"?"
     show: 
-      already_requested: "You have already sent a request to %{name}."
-      does_not_exist: "Person does not exist!"
-      no_posts: "no posts to display!"
-      not_connected: "You are not connected with this person"
-      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+      already_requested: "Tu jau išsiuntei prašymą, kurio adresatas yra \"%{name}\"."
+      does_not_exist: "Asmuo neegzistuoja!"
+      no_posts: "nėra jokių pokalbių"
+      not_connected: "Tu nesusijungęs su šiuo asmeniu"
+      request_people: "Jei nori, gali paprašyti jį pridėti į vieną iš savo aspektų."
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Nepavyko atnaujinti profilio"
+      updated: "Profilis atnaujintas"
   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?"
+      integrity_error: "Nuotraukos nusiųsti nepavyko. Ar ten tikrai paveiksliukas?"
+      runtime_error: "Nuotraukos nusiųsti nepavyko. Ar esi prisisegęs saugos diržus?"
+      type_error: "Nuotraukos nusiųsti nepavyko. Ar tikrai pasirinkai paveiksliuką?"
     destroy: 
-      notice: "Photo deleted."
+      notice: "Nuotrauka pašalinta."
     edit: 
-      editing: "Editing"
+      editing: "Redagavimas"
     new: 
-      back_to_list: "Back to List"
-      new_photo: "New Photo"
-      post_it: "post it!"
+      back_to_list: "Atgal į sąrašą"
+      new_photo: "Nauja nuotrauka"
+      post_it: "paskelbti!"
     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}."
+      empty: "{file} yra tuščias, pasirink failus iš naujo."
+      invalid_ext: "{file} turi neteisingą galūnę. Yra leidžiamos tik {extensions}."
+      size_error: "{file} yra per didelis, maksimalus failo dydis yra {sizeLimit}."
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "rodyti visas nuotraukas, kurias įkėlė %{name}"
     show: 
-      delete_photo: "Delete Photo"
+      delete_photo: "Pašalinti nuotrauką"
       edit: "edit"
-      edit_delete_photo: "Edit photo description / delete photo"
-      make_profile_photo: "make profile photo"
-      original_post: "Original Post"
-      update_photo: "Update Photo"
-      view: "view"
+      edit_delete_photo: "Redaguoti nuotraukos aprašymą / pašalinti nuotrauką"
+      make_profile_photo: "padaryti profilio nuotrauką"
+      original_post: "Pradinis pasisakymas"
+      update_photo: "Atnaujinti nuotrauką"
+      view: "rodyti"
     update: 
-      error: "Failed to edit photo."
-      notice: "Photo successfully updated."
+      error: "Nuotraukos atnaujinti nepavyko."
+      notice: "Nuotrauka atnaujinta sėkmingai."
   profile: "Profile"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "Naujų paskyrų kūrimas šiame Diasporos serveryje yra uždarytas."
     create: 
-      success: "You've joined Diaspora!"
+      success: "Prisijungei prie Diasporos!"
     edit: 
-      cancel_my_account: "Cancel my account"
-      edit: "Edit %{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)"
-      unhappy: "Unhappy?"
-      update: "Update"
+      cancel_my_account: "Atšaukti mano paskyrą"
+      edit: "Redaguoti %{name}"
+      leave_blank: "(palik tuščią, jei nenori pakeisti)"
+      password_to_confirm: "(tavo slaptažodis reikalingas, kad patvirtintume pakeitimus)"
+      unhappy: "Nesmagu?"
+      update: "Atnaujinimas"
     new: 
-      sign_up: "Sign up"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      sign_up: "Sukurti paskyrą"
+      sign_up_for_diaspora: "Sukurti paskyrą Diasporoje"
   requests: 
     create: 
-      sending: "Sending..."
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sending: "Siunčiama"
+      sent: "Tu paprašei dalytis su %{name}. Jie tai turėtų pamatyti, kai tik prisijungs prie Diasporos."
     destroy: 
-      error: "Please select an aspect!"
-      ignore: "Ignored friend request."
-      success: "You are now friends."
+      error: "Pasirink aspektą!"
+      ignore: "Ignoruotas prašymas draugauti."
+      success: "Susidraugavai."
     manage_aspect_contacts: 
-      existing: "Existing contacts"
-      manage_within: "Manage contacts within"
+      existing: "Egzistuojantys kontaktai"
+      manage_within: "Valdyti kontaktus ties"
     new_request_to_person: 
-      sent: "sent!"
+      sent: "išsiųsta!"
   search: "Search"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "Prijungimas sėkmingas."
     destroy: 
-      success: "Successfully destroyed authentication."
+      success: "Atjungimas sėkmingas."
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_twitter: "Connect to twitter"
-      disconnect: "disconnect"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
-  settings: "Settings"
+      connect_to_facebook: "Prijungti facebook"
+      connect_to_twitter: "Prijungti twitter"
+      disconnect: "atjungti"
+      logged_in_as: "sujungta su"
+      really_disconnect: "atjungti %{service}?"
+  settings: "Nustatymai"
   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"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      create_request: "Rask pagal Diaspora vartotojo vardą"
+      diaspora_handle: "Diasporos vartotojo vardas"
+      enter_a_diaspora_username: "Įvesk Diasporos vartotojo vardą:"
+      know_email: "Žinai jų el. pašto adresus? Turėtum juos pakviesti"
+      your_diaspora_username_is: "Tavo Diasporos vartotojo vardas yra: %{diaspora_handle}"
     aspect_contacts: 
-      add_aspect: "add aspect"
-      add_existing: "Add an existing contact"
-      add_to: "add to %{aspect}"
-      all_contacts: "All contacts"
-      aspect_settings: "Aspect settings"
-      aspects: "Aspects"
-      confirm_remove_aspect: "Remove aspect?"
-      contacts: "contacts"
-      done_editing: "done editing"
-      invites: "Invites"
-      new_request: "%{count} new request!"
-      new_requests: "%{count} new requests!"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
-      remove_aspect: "Remove Aspect"
+      add_aspect: "pridėk aspektą"
+      add_existing: "Pridėk esamą kontaktą"
+      add_to: "pridėti į %{aspect}"
+      all_contacts: "Visi kontaktai"
+      aspect_settings: "Aspekto nustatymai"
+      aspects: "Aspektai"
+      confirm_remove_aspect: "Pašalinti aspektą?"
+      contacts: "kontaktai"
+      done_editing: "redagavimas baigtas"
+      invites: "Pakvietimai"
+      new_request: "%{count} naujas pakvietimas!"
+      new_requests: "Naujų pakvietimų: %{count}!"
+      no_contacts: "Šiuo metu neturi kontaktų. Rask savo kontaktus čia."
+      remove_aspect: "Pašalinti aspektą"
     contact_list: 
-      cannot_remove: "Cannot remove person from last aspect."
-      search_contacts: "Search contacts"
+      cannot_remove: "Iš paskutinio aspekto asmens pašalinti negalima."
+      search_contacts: "Ieškoti kontaktų"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      invitations_left: "(%{count} left)"
-      invite_someone: "Invite someone"
+      dont_have_now: "Tu neturi jokių pakvietimų dabar, tačiau netrukus gausi daugiau!"
+      invitations_left: "(liko %{count})"
+      invite_someone: "Pakviesk ką nors"
     notification: 
-      new: "New %{type} from %{from}"
+      new: "Naujas %{type} iš vartotojo \"%{from}\""
     public_explain: 
-      logged_in: "logged in to %{service}"
-      manage: "manage connected services"
-      outside: "Public messages will be available for others outside of Diaspora to see."
-      title: "You are about to post a public message!"
+      logged_in: "Prisijungta į %{service}"
+      manage: "valdyti prijungtus tinklus"
+      outside: "Viešos žinutės bus matomos kitiems už Diasporos ribų."
+      title: "Tu ketini skelbti viešą žinutę!"
     publisher: 
-      add_photos: "add photos"
-      all: "all"
-      all_contacts: "all contacts"
-      make_public: "make public"
-      post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
-      share: "Share"
-      share_with: "Share with %{aspect}"
-      share_with_all: "Share with all aspects"
+      add_photos: "pridėti nuotraukų"
+      all: "viskas"
+      all_contacts: "visi kontaktai"
+      make_public: "paviešinti"
+      post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
+      posting: "Rašoma..."
+      share: "Skelbti"
+      share_with: "Skelbti aspekte \"%{aspect}\""
+      share_with_all: "Skelbti visuose aspektuose"
     reshare: 
-      reshare: "Reshare"
+      reshare: "Skelbti papildomai"
     stream_element: 
-      show_comments: "show comments"
+      show_comments: "rodyti komentarus"
   status_messages: 
     helper: 
-      no_message_to_display: "No message to display."
+      no_message_to_display: "Žinučių nėra."
     new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+      oh_yeah: "o taip!"
+      tell_me_something_good: "papasakok man ką nors gero"
     show: 
-      destroy: "Destroy"
-  the_world: "the world"
-  username: "Username"
+      destroy: "Sunaikinti"
+  the_world: "pasaulis"
+  username: "Vartotojo vardas"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "Paskyra uždaryta sėkmingai."
     edit: 
-      change_language: "Change Language"
-      change_password: "Change Password"
-      close_account: "Close Account"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
-      export_data: "Export Data"
-      new_password: "New Password"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      change_language: "Keisti kalbą"
+      change_password: "Keisti slaptažodį"
+      close_account: "Uždaryti paskyrą"
+      download_photos: "atsisiųsti mano nuotraukas"
+      download_xml: "atsisiųsti mano duomenis xml formatu"
+      export_data: "Eksportuoti duomenis"
+      new_password: "Naujas slaptažodis"
+      your_email: "Tavo el. pašto adresas"
+      your_handle: "Tavo Diasporos vartotojo vardas"
     getting_started: 
-      connect_services: "Connect your services"
-      define_aspects: "Define your aspects"
-      edit_profile: "Edit your profile"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
-      signup_steps: "Complete your sign-up by doing these things:"
-      skip: "skip getting started"
+      connect_services: "Prijunk savo tinklus"
+      define_aspects: "Sukurk savo aspektus"
+      edit_profile: "Užpildyk savo profilį"
+      finished: "Baigta!"
+      save_and_continue: "Išsaugoti ir tęsti"
+      signup_steps: "Užbaik prisijungimą atlikdamas šiuos veiksmus:"
+      skip: "praleisti pradinius žingsnius"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
-        your_aspects: "Your aspects"
+        add: "pridėti"
+        aspect_name: "Aspekto pavadinimas"
+        description: "Nurodyk Diasporai, kuriuos tavo aspektus matys kurie draugai. Tai galėsi keisti vėliau paspausdamas valdymo puslapį viršuje dešinėje. Tavo aspektai yra unikalūs tau, ir nematomi kitiems."
+        your_aspects: "Tavo aspektai"
       step_3: 
-        description: "Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select \"public.\""
-        your_services: "Your services"
+        description: "Prijunk savo socialinius tinklus prie Diasporos paskyros. Tu galėsi viešai rašyti per savo \"visi\" puslapį, kai pasirinksi \"viešai\""
+        your_services: "Tavo tinklai"
       step_4: 
-        change_profile: "You can change your profile any time by clicking"
-        continue: "Continue on to your everyone page, an overview of all of your aspects."
-        finish: "Finish"
-        manage_aspects: "You can manage your aspects any time by clicking the"
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "in your user menu (top right)."
-      welcome: "Welcome to Diaspora!"
+        change_profile: "Savo profilį keisti galėsi bet kada paspausdamas"
+        continue: "Tęsk pereidamas į savo puslapį \"visi\", visų tavo aspektų apžvalgą."
+        finish: "Užbaigti"
+        manage_aspects: "Savo aspektus valdyti galėsi bet kada paspausdamas"
+        ready_to_share: "Dabar esi pasiruošęs pradėti dalytis su "
+        set_up: "Viskas paruošta, %{name}!"
+        user_menu: "tavo vartotojo meniu (viršuje dešinėje)."
+      welcome: "Labas! Atvykai į Diasporą!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "Vartotojas %{username} neegzistuoja!"
     update: 
-      language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
-      password_changed: "Password Changed"
-      password_not_changed: "Password Change Failed"
+      language_changed: "Kalba pakeista"
+      language_not_changed: "Kalbos pakeisti nepavyko"
+      password_changed: "Slaptažodis pakeistas"
+      password_not_changed: "Slaptažodžio pakeisti nepavyko"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index e4a896010..c430dcbc4 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -6,31 +6,31 @@
 pt-PT: 
   _comments: "Comments"
   _home: "Home"
-  _photos: "photos"
-  _services: "Services"
-  account: "Account"
+  _photos: "Fotografias"
+  _services: "Serviços"
+  account: "Conta"
   activemodel: 
     errors: 
       models: 
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken"
+              taken: "já existe"
         user: 
           attributes: 
             email: 
-              taken: "is already taken"
+              taken: "já existe"
             person: 
-              invalid: "is invalid"
+              invalid: "é inválida"
             username: 
-              taken: "is already taken"
-  ago: "ago"
+              taken: "já existe"
+  ago: "atrás"
   application: 
     helper: 
-      unknown_person: "unknown person"
+      unknown_person: "utilizador(a) desconhecido(a)"
       youtube_title: 
         unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+  are_you_sure: "Tem a certeza?"
   aspects: 
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
@@ -39,27 +39,27 @@ pt-PT:
       failure: "Aspect creation failed."
       success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
     destroy: 
-      success: "%{name} was successfully removed."
+      success: "%{name} foi removido com sucesso."
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspect not empty"
-      remove: "remove"
+      aspect_not_empty: "Perfil não está vazio"
+      remove: "remover"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
     manage: 
-      add_a_new_aspect: "Add a new aspect"
+      add_a_new_aspect: "Adicionar um novo perfil"
       add_a_new_contact: "Add a new contact"
       drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
+      manage_aspects: "Gerir perfil"
+      no_requests: "Não existem novos pedidos"
+      requests: "Pedidos"
     move_contact: 
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
     new_aspect: 
-      create: "Create"
-      name: "Name"
+      create: "Criar"
+      name: "Nome"
     no_contacts_message: 
       add_contact: "Add a contact"
       add_contact_to: "Add someone to %{aspect_name}"
@@ -102,7 +102,7 @@ pt-PT:
       login_here: "log in here"
       ownership: "Ownership"
       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."
+      share_what_you_want: "Share what you want, with who you want."
       simplicity: "Simplicity"
       simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
   invitations: 
@@ -150,47 +150,47 @@ pt-PT:
   ok: "OK"
   or: "or"
   password: "Password"
-  password_confirmation: "Password confirmation"
+  password_confirmation: "Confirme a sua password"
   people: 
     edit: 
       allow_search: "Allow for people to search for you"
-      first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_profile: "Your profile"
+      first_name: "Primeiro Nome"
+      info_available_to: "Esta informação ficará disponível para todos aqueles a que se ligar no Diaspora. "
+      last_name: "Último Nome"
+      update_profile: "Actualizar o Perfil"
+      your_bio: "Biografia"
+      your_birthday: "Aniversário"
+      your_gender: "Género"
+      your_name: "Nome"
+      your_photo: "Fotografia"
+      your_profile: "Perfil"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " results for %{params}"
     index: 
-      results_for: "search results for"
+      results_for: "resultados de pesquisa para"
     person: 
       add_contact: "add contact"
       already_connected: "Already connected"
-      pending_request: "pending request"
-      thats_you: "thats you!"
+      pending_request: "pedido pendente"
+      thats_you: "És tu!"
     profile_photo_upload: 
-      or_select_one: "or select one from your already existing"
+      or_select_one: "ou escolhe um dos já existentes"
     profile_sidebar: 
       bio: "bio"
       born: "born"
       cannot_remove: "Cannot remove %{name} from last aspect."
-      edit_my_profile: "Edit my profile"
+      edit_my_profile: "Editar o meu perfil"
       gender: "gender"
       in_aspects: "in aspects"
       remove_contact: "remove contact"
       remove_from: "Remove %{name} from %{aspect}?"
     show: 
-      already_requested: "You have already sent a request to %{name}."
-      does_not_exist: "Person does not exist!"
-      no_posts: "no posts to display!"
+      already_requested: "Já enviaste um pedido a %{name}."
+      does_not_exist: "Essa pessoa não existe ou não está cá. "
+      no_posts: "Não existem entradas para mostrar!"
       not_connected: "You are not connected with this person"
-      request_people: "If you'd like, you can request to place him/her in one of your aspects."
+      request_people: "Se quiseres podes pedir para ele/ela te colocar num dos teus perfis."
     update: 
       failed: "Failed to update profile"
       updated: "Profile updated"
@@ -246,7 +246,7 @@ pt-PT:
     destroy: 
       error: "Please select an aspect!"
       ignore: "Ignored friend request."
-      success: "You are now friends."
+      success: "São agora amigos."
     manage_aspect_contacts: 
       existing: "Existing contacts"
       manage_within: "Manage contacts within"
@@ -255,16 +255,16 @@ pt-PT:
   search: "Search"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "Autenticação bem sucedida."
     destroy: 
-      success: "Successfully destroyed authentication."
+      success: "A autenticação foi destruída com sucesso."
     index: 
       connect_to_facebook: "Connect to facebook"
       connect_to_twitter: "Connect to twitter"
       disconnect: "disconnect"
       logged_in_as: "logged in as"
       really_disconnect: "disconnect %{service}?"
-  settings: "Settings"
+  settings: "Definições "
   shared: 
     add_contact: 
       create_request: "Find by Diaspora handle"
@@ -292,13 +292,13 @@ pt-PT:
       search_contacts: "Search contacts"
     invitations: 
       dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      invitations_left: "(%{count} left)"
+      invitations_left: "(faltam %{count})"
       invite_someone: "Invite someone"
     notification: 
       new: "New %{type} from %{from}"
     public_explain: 
-      logged_in: "logged in to %{service}"
-      manage: "manage connected services"
+      logged_in: "Logado em %{service}"
+      manage: "Gerir ligação a outros serviços"
       outside: "Public messages will be available for others outside of Diaspora to see."
       title: "You are about to post a public message!"
     publisher: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index c090baef7..e3e164442 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -64,13 +64,13 @@ ru:
       add_contact: "Добавить новый контакт"
       add_contact_to: "Добавить кого нибудь в %{aspect_name}"
       invite: "Пригласить кого-нибудь присоединится к Диаспоре!"
-      nobody: "Сообщите людям, что происходит в вашей жизни в Диаспору!"
+      nobody: "Сообщите людям, что происходит в вашей жизни через Диаспору!"
       nobody_in_aspect: "Ваш аспект '%{aspect_name}' пуст."
     no_posts_message: 
-      start_talking: "Здесь ещё никто ничего не сказал.  Начать разговор !"
+      start_talking: "Здесь ещё никто ничего не сказал.  Начать разговор!"
     remove_from_aspect: 
-      failure: "Не удалось удалить персоны с аспекта"
-      success: "Персона удалена с аспекта"
+      failure: "Не удалось удалить человека с аспекта"
+      success: "Человек удален с аспекта"
     seed: 
       family: "Семья"
       work: "Работа"
@@ -91,17 +91,17 @@ ru:
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Исправьте ошибки и попробуйте вновь."
-      invalid_fields: "неверная запись"
+      invalid_fields: "Неверная запись"
   fill_me_out: "Заполнить"
   home: 
     show: 
-      already_account: "уже есть аккаунт?"
+      already_account: "уже есть учётная запись?"
       choice: "Выбор"
-      choice_explanation: "Диаспора позволяет сортировать группы, названные аспектами. Уникальные аспекты , обеспечивают безопасность вашим фотографиям, историям и анекдоты. Они будут являются общими только людей, которых вы хотите там видеть."
-      learn_about_host: "Узнайте о том, как организовать свой собственный сервер диаспоры."
-      login_here: "Войдите здесь"
+      choice_explanation: "Диаспора позволяет сортировать группы, названные аспектами. Аспекты уникальны, это позволяет обеспечивать безопасность вашим фотографиям, историям и тд. Они будут являются общими только для тех людей, которых вы хотите там видеть."
+      learn_about_host: "Узнайте о том, как организовать свой собственный сервер Диаспоры."
+      login_here: "Войти здесь"
       ownership: "Собственность"
-      ownership_explanation: "Вы являетесь владельцем фотографии. Вы сохраняете право собственности на все, что вы предоставляете Диаспоре, что дает вам полный контроль над тем, как это распространяется."
+      ownership_explanation: "Вы сохраняете право собственности на все, что вы предоставляете Диаспоре, что дает вам полный контроль над тем, как это распространяется."
       share_what_you_want: "Поделитесь тем, что хотите, с кем вы хотите."
       simplicity: "Простота"
       simplicity_explanation: "Диаспора делает обмен чистым и лёгким - и это распространяется и на частную жизнь. По существу диаспора не заставляет вас пробираться через страницы настроек и опций, для того чтобы, держать ваш профиль в безопасности."
@@ -165,7 +165,7 @@ ru:
       your_photo: "Фото"
       your_profile: "Ваш профиль"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
+      people_on_pod_are_aware_of: "люди на сервере знают о"
       results_for: "результаты для %{params}"
     index: 
       results_for: "результат поиска для"
@@ -190,7 +190,7 @@ ru:
       does_not_exist: "Персоны не существует !"
       no_posts: "Новых сообщений нет!"
       not_connected: "Вы не связаны с этим человеком"
-      request_people: "Если хотите, вы можете спросить разрешения его/ее добавить в аспект"
+      request_people: "Если хотите, вы можете спросить его/ее разрешения добавить в аспект"
     update: 
       failed: "Обновить профиль не удалось"
       updated: "Профиль обновлён"
@@ -208,14 +208,14 @@ ru:
       new_photo: "Новая фотография"
       post_it: "Опубликовать!"
     new_photo: 
-      empty: "{file} пуст, вы можете выбрать файлы вновь без него."
+      empty: "{file} пуст, вы можете повторно выбрать файлы без него."
       invalid_ext: "{file} имеет не допустимое расширение. Разрешены только {extensions}."
-      size_error: "{file} слишком большой, максимальный размер файла это {sizeLimit}."
+      size_error: "{file} слишком большой, максимальный размер файла {sizeLimit}."
     photo: 
       view_all: "Посмотреть все фотографии %{name}"
     show: 
       delete_photo: "Удалить"
-      edit: "редиктировать"
+      edit: "редактировать"
       edit_delete_photo: "Изменить описание фото / удалить фото"
       make_profile_photo: "сделать фотографией профиля"
       original_post: "Оригинальное сообщение"
@@ -228,10 +228,10 @@ ru:
   registrations: 
     closed: "В этой части Диаспоры регистрация закрыта"
     create: 
-      success: "добро пожаловать в Диаспору!"
+      success: "Добро пожаловать в Диаспору!"
     edit: 
       cancel_my_account: "Отменить мой аккаунт"
-      edit: "Редиктировать %{name}"
+      edit: "Редактировать %{name}"
       leave_blank: "(Оставьте пустым, если не хотите менять)"
       password_to_confirm: "(Введите ваш текущий пароль для подтверждения изменений)"
       unhappy: "Несчастны?"
@@ -245,7 +245,7 @@ ru:
       sent: "Вы попросили поделиться с %{name}. Они увидят это при следующем входе в Диаспору."
     destroy: 
       error: "Выберите аспект!"
-      ignore: "Игнорированные запросы на дружбу."
+      ignore: "Игнорированые запросы на дружбу."
       success: "Теперь вы друзья."
     manage_aspect_contacts: 
       existing: "Существующие контакты"
@@ -257,17 +257,17 @@ ru:
     create: 
       success: "Проверка подлинности прошла успешно."
     destroy: 
-      success: "Подлинность отчищена."
+      success: "Аутентификация успешно уничтожена."
     index: 
       connect_to_facebook: "Подключение к Facebook"
       connect_to_twitter: "Подключение к Twitter"
       disconnect: "разъединить"
-      logged_in_as: "вошли как"
+      logged_in_as: "Вы вошли как"
       really_disconnect: "отключить %{service}?"
   settings: "Настройки"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "Поиск по Диаспоре"
       diaspora_handle: "Руководство Диаспоры"
       enter_a_diaspora_username: "Введите имя пользователя диаспоры:"
       know_email: "Знаете их адреса электронной почты? Приглашайте"
@@ -288,10 +288,10 @@ ru:
       no_contacts: "У вас нет контактов. Найти контакты здесь."
       remove_aspect: "Удалить Аспект"
     contact_list: 
-      cannot_remove: "Не может удалить человека с последнего аспекта. (Если вы хотите, отключить  этого человека необходимо удалить контакт)"
+      cannot_remove: "Не может удалить человека с последнего аспекта. (Если вы хотите, отключить этого человека необходимо удалить контакт)"
       search_contacts: "Поиск контактов"
     invitations: 
-      dont_have_now: "Вы не имеете права сейчас, но больше приглашений не за горами!\n"
+      dont_have_now: "Сейчас у вас больше нет приглашений, но новые уже не за горами!"
       invitations_left: "(осталось %{count})"
       invite_someone: "Пригласить кого-нибудь"
     notification: 
@@ -299,7 +299,7 @@ ru:
     public_explain: 
       logged_in: "Войти в %{service}"
       manage: "Управление сервисами"
-      outside: "Публичные сообщения доступны для чтения всем, даже за пределами вашей диаспоры."
+      outside: "Публичные сообщения доступны для чтения всем, даже за пределами вашей Диаспоры."
       title: "Вы собираетесь отправить публичное сообщение!"
     publisher: 
       add_photos: "добавить фото"
@@ -319,7 +319,7 @@ ru:
     helper: 
       no_message_to_display: "Новых сообщений нет."
     new_status_message: 
-      oh_yeah: "о да!"
+      oh_yeah: "О да!"
       tell_me_something_good: "расскажи мне что-нибудь хорошее"
     show: 
       destroy: "Уничтожить"