diff --git a/COPYRIGHT b/COPYRIGHT
index c1e5ed8763920a86abf933ef2b9c73869a3523a7..af330bbc2159bb18cb82e5c7dea40a4e8205943f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1 +1,14 @@
 Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed under the Affero General Public License version 3, the text of which can be found in GNU-AGPL-3.0, unless otherwise noted.  Components of Diaspora, including Rails, JQuery, and Devise, are licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a modified version of the MIT/X11 license.  All unmodified files from these and other sources retain their original copyright and license notices: see the relevant individual files.  Attribution information for Diaspora is contained in the AUTHORS file.
+
+* In addition, as a special exception, the copyright holders give
+* permission to link the code of portions of this program with the
+* OpenSSL library under certain conditions as described in each
+* individual source file, and distribute linked combinations
+* including the two.
+* You must obey the GNU General Public License in all respects
+* for all of the code used other than OpenSSL.  If you modify
+* file(s) with this exception, you may extend this exception to your
+* version of the file(s), but you are not obligated to do so.  If you
+* do not wish to do so, delete this exception statement from your
+* version.  If you delete this exception statement from all source
+* files in the program, then also delete it here.
\ No newline at end of file
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index afd6b016f88c56fcb6de545ef315d787da4aee80..14aa9e7b850959ca3332ce3e718ba6a07d474e89 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -16,7 +16,7 @@ class AspectsController < ApplicationController
 
   def create
     @aspect = current_user.aspect params[:aspect]
-    flash[:notice] = "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+    flash[:notice] = I18n.t('aspects.create.success')
     respond_with :location => aspects_manage_path
   end
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 6a328dff803008b405c2ab1706a3e032eeb21c44..72f4c46b921b6cc3825c088aba3e3facc4395e5a 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -35,6 +35,7 @@ class Person
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
   def self.search(query)
+    query = query.to_s.strip
     Person.all('profile.first_name' => /^#{query}/i) | Person.all('profile.last_name' => /^#{query}/i)
   end
 
diff --git a/app/models/request.rb b/app/models/request.rb
index da62edd937d83c372523c883143944f62226a372..739500e4e8c8fed1a9ae9cf4a2cbbaafe72f506e 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -26,8 +26,8 @@ class Request
   validates_presence_of :destination_url, :callback_url
   before_validation :clean_link
 
-  scope :for_user,  lambda{ |user| where(:destination_url    => user.receive_url) }
-  scope :from_user, lambda{ |user| where(:destination_url.ne => user.receive_url) }
+  scope :for_user,  lambda{ |user| where(:destination_url    => user.person.receive_url) }
+  scope :from_user, lambda{ |user| where(:destination_url.ne => user.person.receive_url) }
 
   def self.instantiate(options = {})
     person = options[:from]
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index b5bc7ace3fce10d83c4dd75fe01e0e2178fcdf54..3ca07ac17c38987d4dbdcc49aa9eb717a9648409 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 
-%h1 Add a new aspect
+%h1=t('.add_a_new_aspect')
 = form_for Aspect.new do |f|
   = f.error_messages
   %p
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 56252c83df1d7f1463a9f7ad6c9f45e422ee0f85..4252d9762af6c514c643aefeec7c43e646392e81 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -9,4 +9,4 @@
     = link_to post.person.real_name, post.person
     = auto_link sanitize post.text
   %div.time
-    = "#{time_ago_in_words(post.updated_at)} ago"
+    = "#{time_ago_in_words(post.updated_at)} #{t('.ago')}"
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index e998d98b76f44442cce1755bb238f6d047fbb222..a4268082d8844d4aacfe532ba0bbcb49e5dbba90 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -9,4 +9,4 @@
     = f.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
   = f.hidden_field :post_id, :value => post.id
   %p{:style => "text-align:right;"}
-    = f.submit "Comment", :class => "comment_submit button"
+    = f.submit t('.comment'), :class => "comment_submit button"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 1840d7acc2bea61498a8c0acf2d7bc793f982a66..7ce75f5f3116917a9be60d51346fecbe77ac35cb 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,3 +1,9 @@
+%h1
+  This is a technology preview, do not provide any private information.
+%h3 
+  your account may be deleted until we move into a more stable development period. 
+%h3
+  USE AT YOUR OWN RISK!!
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
   #user
     %p.username
@@ -14,6 +20,7 @@
   /  = f.check_box :remember_me
   /  = f.label :remember_me
   = f.submit "Sign in"
+  = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
   %p
 = render :partial => "devise/shared/links"
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
new file mode 100644
index 0000000000000000000000000000000000000000..23617a3f3e66d49191cb9e5544c8b8048fdb5b2b
--- /dev/null
+++ b/config/locales/de.yml
@@ -0,0 +1,116 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+de:
+  hello: "Hallo Welt"
+  layouts:
+      application:
+          edit_profile: "Profil bearbeiten"
+          logout: "Ausloggen"
+  shared:
+      aspect_nav:
+          all_aspects: "Alle Aspekte"
+          manage: "Verwalten"
+          manage_your_aspects: "Aspekte verwalten"
+      sub_header:
+          all_aspects: "Alle Aspekte"
+          manage_aspects: "Aspekte verwalten"
+      publisher:
+          share: "Teilen"
+      aspect_friends:
+          add_friends: "Freunde hinzufügen"
+  albums:
+      album:
+          you: "dir"
+      new_album:
+          create: "erstellen"
+          add_a_new_album: "Album hinzufügen"
+      show: 
+          edit_album: "Album bearbeiten"
+          albums: "Alben"
+          updated: "aktualisiert"
+          by: "von"
+      edit:
+          editing: "Bearbeite"
+          updated: "geändert"
+          are_you_sure: "Bist du sicher?"
+          delete_album: "Album löschen"
+          cancel: "Abbrechen"
+      index:
+          home: "Startseite"
+          new_album: "Neues Album"
+  aspects:
+      index:
+          photos: "Fotos"
+      show:
+          photos: "Fotos"
+      manage:
+          add_a_new_aspect: "Neuen Aspekt erstellen"
+          add_a_new_friend:  "Freund hinzufügen"
+          show: "Anzeigen"
+          update_aspects: "Aspekte aktualisieren"
+          requests: "Anfragen"
+          ignore_remove: "Ignorieren/Entfernen"
+      new_aspect:
+          create: "Erstellen"
+  users:
+      edit:
+          cancel: "Abbrechen"
+          update_profile: "Profil aktualisieren"
+          home: "Startseite"
+          diaspora_username: "Diaspora Benutzername"
+          info: "Info"
+          picture: "Bild"
+          editing_profile: "Profil bearbeiten"
+          albums: "Alben"
+  comments:
+      comment:
+          # this won't work in german at all. Needs more thorough I18n
+          ago: "ago"
+      new_comment:
+          comment: "Kommentar"
+  photos:
+      show:
+          prev: "zurück"
+          full_size: "volle Größe"
+          next: "vor"
+          edit_photo: "Foto bearbeiten"
+          delete_photo: "Foto löschen"
+          are_you_sure: "Bist du sicher?"
+          comments: "Kommentare"
+      edit:
+          editing: "Bearbeite"
+          are_you_sure: "Bist du sicher?"
+          delete_photo: "Foto löschen"
+      photo:
+          show_comments: "Kommentare anzeigen"
+      new:
+          new_photo: "Foto erstellen"
+          back_to_list: "Zurück zur Liste"
+          post_it: "Hochladen"
+  registrations:
+      new:
+          sign_up: "Anmelden"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "Erzähl' mir was schönes!"
+          oh_yeah: "Hey, super!"
+      status_message:
+          show_comments: "Kommentare anzeigen"
+          delete: "Löschen"
+          are_you_sure: "Bist du sicher?"
+      show:
+          status_message: "Statusmeldung"
+          comments: "Kommentare"
+          are_you_sure: "Bist du sicher?"
+          destroy: "Löschen"
+          view_all: "Alle anzeigen"
+          message: "Nachricht"
+          owner: "Besitzer"
+          
+      
diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
new file mode 100644
index 0000000000000000000000000000000000000000..34947cbc21eaf472a8dd82d5bf657ca83d34a90b
--- /dev/null
+++ b/config/locales/devise.de.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+de:
+  errors:
+    messages:
+      not_found: "nicht gefunden"
+      already_confirmed: "wurde bereits bestätigt"
+      not_locked: "war nicht gesperrt"
+
+  devise:
+    failure:
+      unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.'
+      unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.'
+      locked: 'Dein Konto ist gesperrt.'
+      invalid: 'Ungültige E-Mail-Adresse oder Passwort.'
+      invalid_token: 'Ungültiger Authentifizierungstoken.'
+      timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich wieder an um fortzufahren.'
+      inactive: 'Dein Konto wurde noch nicht aktiviert.'
+    sessions:
+      signed_in: 'Erfolgreich angemeldet.'
+      signed_out: 'Erfolgreich abgemeldet.'
+    passwords:
+      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt.'
+      updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet.'
+    confirmations:
+      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.'
+      confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.'
+    registrations:
+      signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.'
+      updated: 'Dein Konto wurde aktualisiert.'
+      destroyed: 'Tschüss! Dein Konto wurde erfolgreich abgemeldet. Wir hoffen dich bald wiederzusehen.'
+    unlocks:
+      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.'
+    mailer:
+      confirmation_instructions: 'Instruktionen zur Bestätigung'
+      reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts'
+      unlock_instructions: 'Instruktionen zum Entsperren'
diff --git a/config/locales/devise.es.yml b/config/locales/devise.es.yml
index 70209ff7944ab344d15987493c966fc3152ede50..06002aa637717108a0da1e291d359edbb32cd001 100644
--- a/config/locales/devise.es.yml
+++ b/config/locales/devise.es.yml
@@ -18,10 +18,10 @@ es:
       signed_in: 'Has ingresado correctamente.'
       signed_out: 'Has salido correctamente.'
     passwords:
-      send_instructions: 'Recibirás un email con instrucciones para cambiar tu contraseña en poco minutos.'
+      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.'
     confirmations:
-      send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en poco minutos.'
+      send_instructions: 'Recibirás un email con instrucciones para confirmar tu cuenta en pocos minutos.'
       confirmed: 'Tu cuenta ha sido confirmada. Ya has accedido a tu cuenta.'
     registrations:
       signed_up: 'Te has registrado correctamente. Si está disponible, te habremos enviado un email de confirmación.'
diff --git a/config/locales/devise.fi.yml b/config/locales/devise.fi.yml
index 4ee6761f8c843d8ce0c0203c36a072d3f40ae505..9109b40a85f5e03db80fabfc78eb7b138a04bca9 100644
--- a/config/locales/devise.fi.yml
+++ b/config/locales/devise.fi.yml
@@ -13,7 +13,7 @@ fi:
   devise:
     failure:
       unauthenticated: 'Kirjaudu tai rekisteröidy ennen kuin voit jatkaa.'
-      unconfirmed: 'Sinun pitää vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
+      unconfirmed: 'Sinun täytyy vahvistaa käyttäjätilisi ennen kuin voit jatkaa'
       locked: 'Käyttäjätilisi on lukittu.'
       invalid: 'Väärä sähköpostiosoite tai salasana.'
       invalid_token: 'Viallinen todennus.'
@@ -21,9 +21,9 @@ fi:
       inactive: 'Käyttätiliäsi ei ole vielä vahvistettu.'
     sessions:
       signed_in: 'Sisäänkirjautuminen onnistui.'
-      signed_out: 'Uoskirjautuminen onnistui.'
+      signed_out: 'Uloskirjautuminen onnistui.'
     passwords:
-      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten asetat salasanasi uudelleen.'
+      send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten määrität salasanasi uudelleen.'
       updated: 'Salasanasi on vaihdettu. Olet nyt kirjautunut sisään.'
     confirmations:
       send_instructions: 'Saat hetken päästä sähköpostiisi ohjeet siitä miten vahvistat käyttäjätilisi luonnin.'
@@ -37,5 +37,5 @@ fi:
       unlocked: 'Käyttäjätilisi lukitus on avattu. Olet nyt kirjautunut sisään.'
     mailer:
       confirmation_instructions: 'Ohjeet vahvistamiseen/todentamiseen'
-      reset_password_instructions: 'Ohjeet salananan uudelleenasettamiseksi'
+      reset_password_instructions: 'Ohjeet salananan uudelleenmäärittämiseksi'
       unlock_instructions: 'Ohjeet lukituksen poistamiseksi'
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b8691eb3a3291e7e9279374edec0ea9eb78d622d
--- /dev/null
+++ b/config/locales/devise.fr.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+fr:
+  errors:
+    messages:
+      not_found: "introuvable"
+      already_confirmed: "a déjà été confirmé"
+      not_locked: "n’a pas été verrouillé"
+
+  devise:
+    failure:
+      unauthenticated: 'Vous devez vous connecter ou vous inscrire avant de continuer.'
+      unconfirmed: 'Vous devez confirmer votre compte avant de continuer.'
+      locked: 'Votre compte est verrouillé.'
+      invalid: 'E-mail ou mot de passe invalide.'
+      invalid_token: 'Jeton d’authentification invalide.'
+      timeout: 'Votre session a expiré, veuillez vous connecter de nouveau afin de continuer.'
+      inactive: 'Votre compte n’a pas encore été activé.'
+    sessions:
+      signed_in: 'Connecté avec succès.'
+      signed_out: 'Déconnecté avec succès.'
+    passwords:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment réinitialiser votre mot de passe.'
+      updated: 'Votre mot de passe a été modifié avec succès. Vous êtes à présent connecté.'
+    confirmations:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment confirmer votre compte.'
+      confirmed: 'Votre compte a été confirmé avec succès. Vous êtes à présent connecté.'
+    registrations:
+      signed_up: 'Vous vous êtes inscrit avec succès. Si activée, une confirmation a été envoyée sur votre adresse e-mail.'
+      updated: 'Vous avez mis à jour votre compte avec succès.'
+      destroyed: 'Au revoir ! Votre compte a été résilié avec succès. Nous espérons vous revoir très bientôt.'
+    unlocks:
+      send_instructions: 'Vous allez recevoir dans quelques minutes un e-mail contenant des instructions vous expliquant comment déverrouiller votre compte.'
+      unlocked: 'Votre compte a été déverrouillé avec succès. Vous êtes à présent connecté.'
+    mailer:
+      confirmation_instructions: 'Instructions de confirmation'
+      reset_password_instructions: 'Réinitialiser les instructions du mot de passe'
+      unlock_instructions: 'Instructions de déverrouillage'
diff --git a/config/locales/devise.it.yml b/config/locales/devise.it.yml
index 75b90affcc6465ae040f41d841d0ae8980228abd..76f761e377e5d9ec302a0d86f3ad94b89e8450ad 100644
--- a/config/locales/devise.it.yml
+++ b/config/locales/devise.it.yml
@@ -12,7 +12,7 @@ it:
 
   devise:
     failure:
-      unauthenticated: "Devi effettuare l'accesso o registrarci prima di continuare."
+      unauthenticated: "Devi effettuare l'accesso o registrarti prima di continuare."
       unconfirmed: "Devi confermare il tuo account prima di continuare."
       locked: "Il tuo account è bloccato."
       invalid: "Email o password errati."
@@ -31,11 +31,11 @@ it:
     registrations:
       signed_up: "Ti sei iscritto. Se il servizio è disponibile, riceverai una conferma via email."
       updated: "Hai aggiornato il tuo account."
-      destroyed: "Ciao!Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
+      destroyed: "Ciao! Il tuo account è stato rimosso. Speriamo che tu torni a trovarci presto."
     unlocks:
       send_instructions: "Tra pochi minuti riceverai una mail con le istruzioni su come sbloccare il tuo account."
       unlocked: "Il tuo account è stato sbloccato. Hai appena effettuato l'accesso."
     mailer:
       confirmation_instructions: "Istruzioni sulla conferma"
       reset_password_instructions: "Istruzioni su come cambiare la password"
-      unlock_instructions: "Istruzione su come sbloccare l'account"
+      unlock_instructions: "Istruzioni su come sbloccare l'account"
diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a490a1a3980c573a7b8a8479835282b6cb30bacb
--- /dev/null
+++ b/config/locales/devise.pl.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+pl:
+  errors:
+    messages:
+      not_found: "nie znaleziono"
+      already_confirmed: "potwierdzono wcześniej"
+      not_locked: "nie był zablokowany"
+
+  devise:
+    failure:
+      unauthenticated: 'By kontynuować musisz się zalogować lub zarejestrować.'
+      unconfirmed: 'Musisz aktywować swoje konto.'
+      locked: 'Twoje konto jest zablokowane.'
+      invalid: 'Nieprawidłowy adres email lub hasło.'
+      invalid_token: 'Nieprawidłowy kod identyfikacyjny.'
+      timeout: 'Twoja sesja wygasła, zaloguj się ponownie by kontynuować.'
+      inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
+    sessions:
+      signed_in: 'Zalogowano pomyślnie.'
+      signed_out: 'Wylogowano.'
+    passwords:
+      send_instructions: 'W ciągu kilku minut otrzymasz maila zawierającego instrukcjie dotyczące zresetowania hasła.'
+      updated: 'Twoje hasło zostało zmienione, zostałeś zalogowany.'
+    confirmations:
+      send_instructions: 'W ciÄ…gu kilku minut otrzymasz maila zawierajÄ…cego instrukcje dotyczÄ…ce aktywacji konta.'
+      confirmed: 'Twoje konto zostało aktywowane, zostałeś zalogowany.'
+    registrations:
+      signed_up: 'Zostałeś zarejestrowany. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie email potwierdzający rejestrację.'
+      updated: 'Pomyślnie zaktualizowano informacje o Twoim koncie.'
+      destroyed: 'Żegnaj! Twoje konto zostało usunięte.'
+    unlocks:
+      send_instructions: 'W ciÄ…gu kilku minut otrzymasz email z instrukcjami odblokowania konta.'
+      unlocked: 'Twoje konto zostało odblokowane, jesteś zalogowany.'
+    mailer:
+      confirmation_instructions: 'Instrukcje aktywacji'
+      reset_password_instructions: 'Instrukcje zmiany hasła'
+      unlock_instructions: 'Instrukcje odblokowania'
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
new file mode 100644
index 0000000000000000000000000000000000000000..670d570267257560e5f0fbf5b73cbe3b10fdda32
--- /dev/null
+++ b/config/locales/devise.ru.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+ru:
+  errors:
+    messages:
+      not_found: "не найден(о)"
+      already_confirmed: "уже подтвержден(о)"
+      not_locked: "не заблокирован(о)"
+
+  devise:
+    failure:
+      unauthenticated: 'Вам нужно войти либо зарегистрироваться, чтобы продолжить.'
+      unconfirmed: 'Вам нужно подтвердить вашу учётную запись, чтобы продолжить.'
+      locked: 'Ваша учётная запись заблокирована.'
+      invalid: 'Неверный e-mail или пароль.'
+      invalid_token: 'Неверный ключ аутентификации.'
+      timeout: 'Срок вашего сеанса истёк, пожалуйста, войдите в систему снова.'
+      inactive: 'Ваша учётная запись ещё не активирована.'
+    sessions:
+      signed_in: 'Вход в систему выполнен успешно.'
+      signed_out: 'Выход из системы выполнен успешно.'
+    passwords:
+      send_instructions: 'Вы получите e-mail с указаниями по сбросу пароля в течение нескольких минут.'
+      updated: 'Ваш пароль был изменён. Вы вошли в систему.'
+    confirmations:
+      send_instructions: 'Вы получите e-mail с указаниями по подтверждению учётной записи в течение нескольких минут.'
+      confirmed: 'Ваша учётная запись была подтверждена. Вы вошли в систему.'
+    registrations:
+      signed_up: 'Регистрация выполнена успешно. В зависимости от настроек, вам может прийти e-mail с подтверждением.'
+      updated: 'Обновление вашей учётной записи выполнено успешно.'
+      destroyed: 'До свидания! Ваша учётная запись была удалена. Надеемся, что вскоре вас увидим снова.'
+    unlocks:
+      send_instructions: 'Вы получите e-mail с указаниями по разблокированию учётной записи в течение нескольких минут.'
+      unlocked: 'Ваша учётная запись была разблокирована. Вы вошли в систему.'
+    mailer:
+      confirmation_instructions: 'Подтверждение учётной записи'
+      reset_password_instructions: 'Сброс пароля'
+      unlock_instructions: 'Разблокирование учётной записи'
diff --git a/config/locales/devise.sv.yml b/config/locales/devise.sv.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b434666cee8a33c242c97618c6c37d1acea0cb8b
--- /dev/null
+++ b/config/locales/devise.sv.yml
@@ -0,0 +1,40 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+ 		
+
+sv:
+  errors:
+    messages:
+      not_found: "kan ej hitta"
+      not_locked: "var ej låst"
+
+  devise:
+    failure:
+      unauthenticated: 'Du måste logga in innan du kan fortsätta.'
+      unconfirmed: 'Du måste verifiera ditt konto innan du kan fortsätta.'
+      locked: 'Ditt konto är låst.'
+      invalid: 'Felaktig användare eller lösenord.'
+      invalid_token: 'Ogiltig identifiering.'
+      timeout: 'Din session är avslutad, var vänlig logga in igen.'
+      inactive: 'Ditt konto är inte aktiverat.'
+    sessions:
+      signed_in: 'Inloggning ok.'
+      signed_out: 'Utloggning ok.'
+    passwords:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att återställa lösenordet inom några minuter.'
+      updated: 'Ditt lösenord har ändrats och du är inloggad.'
+    confirmations:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att verifiera ditt konto inom några minuter.'
+      confirmed: 'Ditt konto har verifierats och du är inloggad.'
+    registrations:
+      signed_up: 'Du har skapat ett konto. Beroende på inställningar kan ett ebrev ha skickats till dig.'
+      updated: 'Ditt konto har uppdateras.'
+      destroyed: 'Ditt konto är avslutat. Välkommen åter!'
+    unlocks:
+      send_instructions: 'Du kommer att få ett ebrev med instruktioner för att låsa upp ditt konto inom några minuter.'
+      unlocked: 'Ditt konto har är nu upplåst och du är inloggad'
+    mailer:
+      confirmation_instructions: 'Instruktioner för att verifiera ditt konto.'
+      reset_password_instructions: 'Instruktioner för att terställa ditt lösenord.'
+      unlock_instructions: 'Instruktioner för att låsa upp ditt konto.'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1de275cf94e159fe15045cf40f88538726d7e669..867b120e0304669e06854d5bb5a11b6182823e82 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -8,3 +8,136 @@
 
 en:
   hello: "Hello world"
+  layouts:
+      application:
+          edit_profile: "edit profile"
+          logout: "logout"
+  shared:
+      aspect_nav:
+          all_aspects: "All Aspects"
+          manage: "Manage"
+          manage_your_aspects: "Manage your Aspects"
+      sub_header:
+          all_aspects: "All Aspects"
+          manage_aspects: "Manage Aspects"
+      publisher:
+          share: "Share"
+      aspect_friends:
+          add_friends: "add friends"
+  albums:
+      album:
+          you: "you"
+      new_album:
+          create: "create"
+          add_a_new_album: "Add a new album"
+      show: 
+          edit_album: "Edit Album"
+          albums: "albums"
+          updated: "updated"
+          by: "by"
+      edit:
+          editing: "Editing"
+          updated: "updated"
+          are_you_sure: "Are you sure?"
+          delete_album: "Delete Album"
+          cancel: "Cancel"
+      index:
+          home: "home"
+          new_album: "New Album"
+      create:
+          success: "You've created an album called %{name}."
+      update:
+          success: "Album %{name} successfully edited."
+          failure: "Failed to edit album %{name}."
+      destroy:
+          success: "Album %{name} deleted."
+  aspects:
+      index:
+          photos: "photos"
+      show:
+          photos: "photos"
+      manage:
+          add_a_new_aspect: "Add a new aspect"
+          add_a_new_friend:  "Add a new friend"
+          show: "Show"
+          update_aspects: "Update Aspects"
+          requests: "Requests"
+          ignore_remove: "Ignore/Remove"
+      new_aspect:
+          add_a_new_aspect: "Add a new aspect"
+          create: "Create"
+      create:
+          success:"Click on the plus on the left side to tell Diaspora who can see your new aspect."
+  users:
+      edit:
+          cancel: "Cancel"
+          update_profile: "Update Profile"
+          home: "Home"
+          diaspora_username: "DIASPORA USERNAME"
+          info: "Info"
+          picture: "Picture"
+          editing_profile: "Editing profile"
+          albums: "Albums"
+          you_dont_have_any_photos: "You don't have any photos!  Go to the"
+          page_to_upload_some:  "page to upload some."
+  comments:
+      comment:
+          ago: "ago"
+      new_comment:
+          comment: "Comment"
+  photos:
+      show:
+          prev: "prev"
+          full_size: "full size"
+          next: "next"
+          edit_photo: "Edit Photo"
+          delete_photo: "Delete Photo"
+          are_you_sure: "Are you sure?"
+          comments: "comments"
+      edit:
+          editing: "Editing"
+          are_you_sure: "Are you sure?"
+          delete_photo: "Delete Photo"
+      photo:
+          show_comments: "show comments"
+          posted_a_new_photo_to: "posted a new photo to"
+      new:
+          new_photo: "New Photo"
+          back_to_list: "Back to List"
+          post_it: "post it!"
+  registrations:
+      new:
+          sign_up: "Sign up"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "tell me something good"
+          oh_yeah: "oh yeah!"
+      status_message:
+          show_comments: "show comments"
+          delete: "Delete"
+          are_you_sure: "Are you sure?"
+      show:
+          status_message: "Status Message"
+          comments: "comments"
+          are_you_sure: "Are you sure?"
+          destroy: "Destroy"
+          view_all: "View All"
+          message: "Message"
+          owner: "Owner"
+  people:
+      index:
+          add_friend: "add friend"
+          real_name: "real name"
+          diaspora_handle: "diaspora handle"
+          thats_you: "that's you!"
+          friend_request_pending: "friend request pending"
+          you_have_a_friend_request_from_this_person: "you have a friend request from this person"
+      new:
+          new_person: "New Person"
+          back_to_list: "Back to List"
+      show:
+          last_seen: "last seen: %{how_long_ago}"
+          friends_since: "friends since: %{how_long_ago}"
+          save: "save"
+          are_you_sure: "Are you sure?"
+          remove_friend: "remove friend"
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
new file mode 100644
index 0000000000000000000000000000000000000000..11c2effdd13cd13cb0c3eab51951da64cf5f34c5
--- /dev/null
+++ b/config/locales/es.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+es:
+  hello: "Hello world"
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9c05ff973a4c676e075dba8f0936c490dc45c71f
--- /dev/null
+++ b/config/locales/fr.yml
@@ -0,0 +1,143 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Localization file for French. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+fr:
+  hello: "Bonjour tout le monde"
+  layouts:
+      application:
+          edit_profile: "éditer le profil"
+          logout: "déconnexion"
+  shared:
+      aspect_nav:
+          all_aspects: "Tous les aspects"
+          manage: "Gérer"
+          manage_your_aspects: "Gérer vos aspects"
+      sub_header:
+          all_aspects: "Tous les aspects"
+          manage_aspects: "Gérer les aspects"
+      publisher:
+          share: "Partager"
+      aspect_friends:
+          add_friends: "ajouter des amis"
+  albums:
+      album:
+          you: "vous"
+      new_album:
+          create: "créer"
+          add_a_new_album: "Ajouter un nouvel album"
+      show: 
+          edit_album: "Éditer l’album"
+          albums: "albums"
+          updated: "mis à jour"
+          by: "par"
+      edit:
+          editing: "Édition"
+          updated: "mis à jour"
+          are_you_sure: "Êtes-vous sûr ?"
+          delete_album: "Supprimer l’album"
+          cancel: "Annuler"
+      index:
+          home: "accueil"
+          new_album: "Nouvel album"
+      create:
+          success: "Tu as créé un album nommé %{name}."
+      update:
+          success: "L’album %{name} a été édité avec succès."
+          failure: "L’édition de l’album %{name} a échoué."
+      destroy:
+          success: "L’album %{name} a été supprimé."
+  aspects:
+      index:
+          photos: "photos"
+      show:
+          photos: "photos"
+      manage:
+          add_a_new_aspect: "Ajouter un nouvel aspect"
+          add_a_new_friend:  "Ajouter un nouvel ami"
+          show: "Afficher"
+          update_aspects: "Metre à jour les aspects"
+          requests: "Requêtes"
+          ignore_remove: "Ignorer/Supprimer"
+      new_aspect:
+          add_a_new_aspect: "Ajouter un nouvel aspect"
+          create: "Créer"
+      create:
+          success:"Cliquez sur plus situé sur le côté gauche afin d’en informer Diaspora qui peut voir votre nouvel aspect."
+  users:
+      edit:
+          cancel: "Annuler"
+          update_profile: "Mettre à jour le profil"
+          home: "Accueil"
+          diaspora_username: "NOM D’UTILISATEUR DIASPORA"
+          info: "Information"
+          picture: "Image"
+          editing_profile: "Édition du profil"
+          albums: "Albums"
+          you_dont_have_any_photos: "Vous n’avez aucune photo !  Rendez-vous sur la page"
+          page_to_upload_some:  "afin d’en transférer quelques-unes."
+  comments:
+      comment:
+          ago: "il y a"
+      new_comment:
+          comment: "Commentaire"
+  photos:
+      show:
+          prev: "précédent"
+          full_size: "taille réelle"
+          next: "suivant"
+          edit_photo: "Éditer la photo"
+          delete_photo: "Supprimer la photo"
+          are_you_sure: "Êtes-vous sûr ?"
+          comments: "commentaires"
+      edit:
+          editing: "Édition"
+          are_you_sure: "Êtes-vous sûr ?"
+          delete_photo: "Supprimer la photo"
+      photo:
+          show_comments: "afficher les commentaires"
+          posted_a_new_photo_to: "a publié une nouvelle photo sur"
+      new:
+          new_photo: "Nouvelle photo"
+          back_to_list: "Retourner à la liste"
+          post_it: "publiez-la !"
+  registrations:
+      new:
+          sign_up: "Inscription"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "dites-moi quelque chose de bien"
+          oh_yeah: "oh ouais !"
+      status_message:
+          show_comments: "afficher les commentaires"
+          delete: "Supprimer"
+          are_you_sure: "Êtes-vous sûr ?"
+      show:
+          status_message: "Message d’état"
+          comments: "commentaires"
+          are_you_sure: "Êtes-vous sûr ?"
+          destroy: "Détruire"
+          view_all: "Tout voir"
+          message: "Message"
+          owner: "Propriétaire"
+  people:
+      index:
+          add_friend: "ajouter un ami"
+          real_name: "nom réel"
+          diaspora_handle: "maniement de diaspora"
+          thats_you: "c’est vous !"
+          friend_request_pending: "Requête d’ami en attente"
+          you_have_a_friend_request_from_this_person: "vous avez une requête d’ami de la part de cette personne"
+      new:
+          new_person: "Nouvelle personne"
+          back_to_list: "Retourner à la liste"
+      show:
+          last_seen: "dernière connexion : %{how_long_ago}"
+          friends_since: "amis depuis : %{how_long_ago}"
+          save: "sauvegarder"
+          are_you_sure: "Êtes-vous sûr ?"
+          remove_friend: "supprimer un ami"
\ No newline at end of file
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
new file mode 100644
index 0000000000000000000000000000000000000000..2052779bd14f6703ae992ffaa03a6c164c9e2ccc
--- /dev/null
+++ b/config/locales/pl.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+pl:
+  hello: "Witaj świecie"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fe944aa599cb25f9db63efae6d4479900a1fa784
--- /dev/null
+++ b/config/locales/ru.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+ru:
+  hello: "Привет, мир"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
new file mode 100644
index 0000000000000000000000000000000000000000..1caf878b88f08f66e5bacbb6dffb6b1903ca77a6
--- /dev/null
+++ b/config/locales/sv.yml
@@ -0,0 +1,10 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+# Swedish localization file. 
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+sv:
+  hello: "Hej"