diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 4ae726a4d7de4bb3b34f3ff7649745c5cf1c8379..c33cfa67888cbe958fac58282f8d1c26d3a7fe7e 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -1,8 +1,9 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
+#   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
-en:
+he:
   errors:
     messages:
       not_found: "×œ× × ×ž×¦×"
@@ -11,30 +12,30 @@ en:
 
   devise:
     failure:
-      unauthenticated: "×¦×¨×™×š ×œ×”×ª×—×‘×¨ ××• ×œ×”×™×¨×©× ×œ×¤× ×™ ×©××¤×©×¨ ×œ×”×ž×©×™×š."
-      unconfirmed: "×¦×¨×™×š ×œ××©×¨ ××ª ×”×—×©×‘×•×Ÿ ×œ×¤× ×™ ×©××¤×©×¨ ×œ×”×ž×©×™×š."
-      locked: "×”×—×©×‘×•×Ÿ ×©×œ×š × ×¢×•×œ."
-      invalid: "××™×ž×™×™×œ ××• ×¡×™×¡×ž×” ×œ× × ×›×•× ×™×."
-      invalid_token: "×ž×¡×¤×¨ ××™×ž×•×ª ×œ× × ×›×•×Ÿ."
-      timeout: "×¤×’ ×ª×•×§×¤×• ×©×œ ×”×—×™×‘×•×¨. × × ×œ×”×ª×—×‘×¨ ×ž×—×“×© ×¢×œ ×ž× ×ª ×œ×”×ž×©×™×š."
-      inactive: "×”×—×©×‘×•×Ÿ ×œ× ××•×ž×ª ×¢×“×™×™×Ÿ."
+      unauthenticated: "×¢×œ×™×š ×œ×”×™×›× ×¡ ××• ×œ×”×™×¨×©× ×œ×¤× ×™ ×”×ž×©×š ×”×¤×¢×™×œ×•×ª."
+      unconfirmed: "×¢×œ×™×š ×œ××ž×ª ××ª ×—×©×‘×•× ×š ×œ×¤×™ ×”×ž×©×š ×”×¤×¢×™×œ×•×ª."
+      locked: "×—×©×‘×•× ×š × ×¢×•×œ."
+      invalid: "×”×¡×¡×ž×” ××• ×”×“×•××´×œ ×©×’×•×™×™×."
+      invalid_token: "××¡×™×ž×•×Ÿ ×”××™×ž×•×ª ×©×’×•×™."
+      timeout: "×”×”×¤×¢×œ×” ×©×œ×š ×¤×’×”, × × ×œ×”×™×›× ×¡ ×©×•×‘ ×›×“×™ ×œ×”×ž×©×™×š."
+      inactive: "×—×©×‘×•× ×š ×œ× ×”×•×¤×¢×œ ×¢×“×™×Ÿ."
     sessions:
-      signed_in: "×”×ª×—×‘×¨×•×ª ×¢×‘×¨×” ×‘×”×¦×œ×—×”."
-      signed_out: "×”×ª× ×ª×§×•×ª ×¢×‘×¨×” ×‘×”×¦×œ×—×”."
+      signed_in: "× ×›× ×¡×ª ×‘×”×¦×œ×—×”."
+      signed_out: "×™×¦××ª ×‘×”×¦×œ×—×”."
     passwords:
-      send_instructions: "××™×ž×™×™×œ ×¢× ×”×•×¨××•×ª ×¢×™×¦×“ ×œ××¤×¡ ×¡×™×¡×ž×” ×™×ª×§×‘×œ ×‘×§×¨×•×‘."
-      updated: "×¡×™×¡×ž×” ×”×•×—×œ×¤×” ×‘×”×¦×œ×—×”, ××ª/×” ×›×¢×ª ×ž×—×•×‘×¨/×ª."
+      send_instructions: "×‘×¢×•×“ ×ž×¡×¤×¨ ×“×§×•×ª ×ª×ª×§×‘×œ ×œ×ª×™×‘×ª ×”×“×•××´×œ ×©×œ×š ×”×•×“×¢×” ×¢× ×”× ×—×™×•×ª ×›×™×¦×“ ×œ××¤×¡ ××ª ×¡×¡×ž×ª×š."
+      updated: "×¡×¡×ž×ª×š ×”×•×—×œ×¤×” ×‘×”×¦×œ×—×”. × ×›× ×¡×ª ×›×¢×ª."
     confirmations:
-      send_instructions: "××™×ž×™×™×œ ×¢× ×”×•×¨××•×ª ×›×™×¦×“ ×œ××ž×ª ××ª ×”×—×©×‘×•×Ÿ ×™×ª×§×‘×œ ×‘×§×¨×•×‘."
-      confirmed: "×—×©×‘×•×Ÿ ××•×ž×ª ×‘×”×¦×œ×—×”. ××ª/×” ×›×¢×ª ×ž×—×•×‘×¨/×ª."
+      send_instructions: "×‘×¢×•×“ ×ž×¡×¤×¨ ×“×§×•×ª ×ª×ª×§×‘×œ ×œ×ª×™×‘×ª ×”×“×•××´×œ ×©×œ×š ×”×•×“×¢×” ×¢× ×”× ×—×™×•×ª ×›×™×¦×“ ×œ××ž×ª ××ª ×—×©×‘×•× ×š."
+      confirmed: "×—×©×‘×•× ×š ××•×ž×ª ×‘×”×¦×œ×—×”. × ×›× ×¡×ª ×›×¢×ª."
     registrations:
-      signed_up: "×”×ª×—×‘×¨×ª ×‘×”×¦×œ×—×”, ×× ×”×“×‘×¨ ×ž××•×¤×©×¨, ×™×ª×§×‘×œ ××™×ž×™×™×œ ××™×©×•×¨ ×‘×§×¨×•×‘.."
+      signed_up: "× ×¨×©×ž×ª ×‘×”×¦×œ×—×”. ×”×•×“×¢×ª ××™×ž×•×ª ×ª×™×©×œ×— ××œ×™×š ×œ×“×•××´×œ ×‘×ž×™×“×” ×©×”×•×’×“×¨×”."
       updated: "×—×©×‘×•× ×š ×¢×•×“×›×Ÿ ×‘×”×¦×œ×—×”."
-      destroyed: "×œ×”×ª×¨××•×ª! ×—×©×‘×•× ×š × ×ž×—×§ ×‘×”×¦×œ×—×”. ×ž×§×•×•×™× ×œ×¨××•×ª×š ×©×•×‘ ×‘×§×¨×•×‘!"
+      destroyed: "×œ×”×ª×¨××•×ª! ×—×©×‘×•× ×š ×‘×•×˜×œ ×‘×”×¦×œ×—×”. ×ž×§×•×•×™× ×œ×¨××•×ª×š ×©×•×‘ ×‘×§×¨×•×‘."
     unlocks:
-      send_instructions: "××™×ž×™×™×œ ×¢× ×”×•×¨××•×ª ×›×™×¦×“ ×œ×”×¡×™×¨ ××ª ×”× ×¢×™×œ×” ×ž×—×©×‘×•× ×š ×™×ª×§×‘×œ ×‘×§×¨×•×‘."
-      unlocked: "×—×©×‘×•× ×š × ×¤×ª×— ×‘×”×¦×œ×—×”. ××ª/×” ×›×¢×ª ×ž×—×•×‘×¨/×ª."
+      send_instructions: "×‘×¢×•×“ ×ž×¡×¤×¨ ×“×§×•×ª ×ª×ª×§×‘×œ ×œ×ª×™×‘×ª ×”×•×“××´×œ ×©×œ×š ×”×•×“×¢×” ×¢× ×”× ×—×™×•×ª ×›×™×¦×“ ×œ×©×—×¨×¨ ××ª ×—×©×‘×•× ×š."
+      unlocked: "×—×©×‘×•× ×š ×©×•×—×¨×¨ ×‘×”×¦×œ×—×”. × ×›× ×¡×ª ×›×¢×ª."
     mailer:
-      confirmation_instructions: "×”×•×¨××•×ª ××™×©×•×¨"
-      reset_password_instructions: "×”×•×¨××•×ª ××™×¤×•×¡ ×¡×™×¡×ž×”"
-      unlock_instructions: "×”×•×¨××•×ª ×”×¡×¨×ª × ×¢×™×œ×”"
+      confirmation_instructions: "×”× ×—×™×•×ª ×œ××™×ž×•×ª"
+      reset_password_instructions: "×”× ×—×™×•×ª ×œ××™×¤×•×¡ ×”×¡×¡×ž×”"
+      unlock_instructions: "×”× ×—×™×•×ª ×œ×©×—×¨×•×¨"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 9f7670a970793f224bc244934b8d63f0d3ddb4e7..8b348b3c72f196151323106ee371302f600ab9c0 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -1,67 +1,72 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
+#   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
+
+
+# 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.
 
 he:
   hello: "×©×œ×•× ×¢×•×œ×"
   application:
       helper:
-          unknown_person: "××“× ×œ× ×ž×•×›×¨"
+          unknown_person: "××“× ×œ× ×™×“×•×¢"
           new_requests: "×‘×§×©×•×ª ×—×“×©×•×ª"
   dashboards:
       helper:
           home: "×‘×™×ª"
   error_messages:
       helper:
-          invalid_fields: "×©×“×•×ª ×œ× ×—×•×§×™×™×"
-          correct_the_following_errors_and_try_again: "× × ×œ×ª×§×Ÿ ××ª ×”×©×’×™××•×ª ×”×‘××•×ª ×•×œ× ×¡×•×ª ×©×•×‘."
+          invalid_fields: "×©×“×•×ª ×©×’×•×™×™×"
+          correct_the_following_errors_and_try_again: "×™×© ×œ×ª×§×Ÿ ××ª ×”×©×’×™××•×ª ×”×‘××•×ª ×•×œ× ×¡×•×ª ×©×•×‘."
   people:
       helper:
            results_for: " ×ª×•×¦××•×ª ×¢×‘×•×¨ %{params}"
-           people_on_pod_are_aware_of: " ×× ×©×™× ×‘×¤×•×“ ×ž×›×™×¨×™× ××ª"
+           people_on_pod_are_aware_of: " ×× ×©×™× ×‘×¤×•×“ ×ž×•×“×¢×™× ×œ×›×š"
   layouts:
       application:
-          edit_profile: "×¢×¨×•×š ×¤×¨×•×¤×™×œ"
-          logout: "×”×ª× ×ª×§"
+          edit_profile: "×¢×¨×™×›×ª ×”×¤×¨×•×¤×™×œ"
+          logout: "×™×¦×™××”"
   shared:
       aspect_nav:
-          all_aspects: "×›×œ ×”××¡×¤×§×˜×™×"
-          manage: "× ×”×œ"
-          manage_your_aspects: "× ×”×œ ××¡×¤×§×˜×™×"
+          all_aspects: "×›×œ ×”×”×™×‘×˜×™×"
+          manage: "× ×™×”×•×œ"
+          manage_your_aspects: "× ×™×”×•×œ ×”×”×™×‘×˜×™× ×©×œ×š"
       sub_header:
-          all_aspects: "×›×œ ×”××¡×¤×§×˜×™×"
-          manage_aspects: "× ×”×œ ××¡×¤×§×˜×™×"
+          all_aspects: "×›×œ ×”×”×™×‘×˜×™×"
+          manage_aspects: "× ×™×”×•×œ ×”×”×™×‘×˜×™×"
       publisher:
-          share: "×©×ª×£"
+          share: "×©×™×ª×•×£"
       aspect_friends:
-          add_friends: "×”×•×¡×£ ×—×‘×¨×™×"
+          add_friends: "×”×•×¡×¤×ª ×—×‘×¨×™×"
   albums:
       album:
-          you: "××ª×”"
+          you: "××ª/×”"
       new_album:
-          create: "×¦×•×¨"
-          add_a_new_album: "×”×•×¡×£ ××œ×‘×•× ×—×“×©"
-      show:
-          edit_album: "×¢×¨×•×š ××œ×‘×•×"
+          create: "×™×¦×™×¨×”"
+          add_a_new_album: "×”×•×¡×¤×ª ××œ×‘×•× ×—×“×©"
+      show: 
+          edit_album: "×¢×¨×™×›×ª ××œ×‘×•×"
           albums: "××œ×‘×•×ž×™×"
-          updated: "×¢×“×›×Ÿ"
+          updated: "×ª××¨×™×š ×”×¢×“×›×•×Ÿ"
           by: "×¢×œ ×™×“×™"
       edit:
           editing: "×¢×¨×™×›×”"
-          updated: "×¢×•×“×›×Ÿ"
-          are_you_sure: "×”×× ××ª/×” ×‘×˜×•×—/×”?"
-          delete_album: "×ž×—×§ ××œ×‘×•×"
-          cancel: "×‘×˜×œ"
+          updated: "×ª××¨×™×š ×”×¢×“×›×•×Ÿ"
+          are_you_sure: "×‘×‘×˜×—×”?"
+          delete_album: "×ž×—×™×§×ª ××œ×‘×•×"
+          cancel: "×‘×™×˜×•×œ"
       index:
           home: "×‘×™×ª"
           new_album: "××œ×‘×•× ×—×“×©"
       create:
           success: "×™×¦×¨×ª ××œ×‘×•× ×‘×©× %{name}."
       update:
-          success: "××œ×‘×•× %{name} ×¢×•×“×›×Ÿ ×‘×”×¦×œ×—×”."
-          failure: "×¢×¨×™×›×ª ××œ×‘×•× %{name} × ×›×©×œ×”."
+          success: "×”××œ×‘×•× %{name} × ×¢×¨×š ×‘×”×¦×œ×—×”."
+          failure: "××™×¨×¢ ×›×©×œ ×‘×¢×¨×™×›×ª ×”××œ×‘×•× %{name}."
       destroy:
-          success: "××œ×‘×•× %{name} × ×ž×—×§."
+          success: "×”××œ×‘×•× %{name} × ×ž×—×§."
       helper:
           friends_albums: "××œ×‘×•×ž×™× ×©×œ ×—×‘×¨×™×"
           your_albums: "×”××œ×‘×•×ž×™× ×©×œ×š"
@@ -71,42 +76,42 @@ he:
       show:
           photos: "×ª×ž×•× ×•×ª"
       manage:
-          add_a_new_aspect: "×”×•×¡×£ ××¡×¤×§×˜"
-          add_a_new_friend:  "×”×•×¡×£ ×—×‘×¨"
-          show: "×”×¦×’"
-          update_aspects: "×¢×“×›×Ÿ ××¡×¤×§×˜×™×"
+          add_a_new_aspect: "×”×•×¡×¤×ª ×”×™×‘×˜ ×—×“×©"
+          add_a_new_friend:  "×”×•×¡×¤×ª ×—×‘×¨ ×—×“×©"
+          show: "×”×¦×’×”"
+          update_aspects: "×¢×“×›×•×Ÿ ×”×”×™×‘×˜×™×"
           requests: "×‘×§×©×•×ª"
-          ignore_remove: "×”×ª×¢×œ×/×ž×—×§"
+          ignore_remove: "×”×ª×¢×œ×ž×•×ª/×”×¡×¨×”"
       new_aspect:
-          add_a_new_aspect: "×”×•×¡×£ ××¡×¤×§×˜"
-          create: "×¦×•×¨"
+          add_a_new_aspect: "×”×•×¡×¤×ª ×”×™×‘×˜ ×—×“×©"
+          create: "×™×¦×™××”"
       create:
-          success: "×œ×—×¥ ×¢×œ ×”×¤×œ×•×¡ ×‘×¦×“ ×™×ž×™×Ÿ ×¢×œ ×ž× ×ª ×œ×§×‘×•×¢ ×ž×™ ×¨×©××™ ×œ×¦×¤×•×ª ×‘××¡×¤×§×˜."
+          success: "×™×© ×œ×œ×—×•×¥ ×¢×œ ×¡×ž×œ ×”×¤×œ×•×¡ ×©×ž×™×ž×™×Ÿ ×›×“×™ ×œ×•×ž×¨ ×œ×“×™××¡×¤×•×¨×” ×ž×™ ×™×¢×•×œ ×œ×¦×¤×•×ª ×‘×”×™×‘×˜ ×”×—×“×© ×©×œ×š."
       destroy:
           success: "%{name} ×”×•×¡×¨ ×‘×”×¦×œ×—×”."
       update:
-          success: "×”××¡×¤×§×˜ ×©×œ×š, %{name}, × ×¢×¨×š ×‘×”×¦×œ×—×”."
+          success: "×”×”×™×‘×˜ ×©×œ×š, %{name}, × ×¢×¨×š ×‘×”×¦×œ×—×”."
       move_friends:
-          failure: "×¢×¨×™×›×ª ××¡×¤×§×˜ × ×›×©×œ×” ×¢×‘×•×¨ %{real_name}."
-          success: "××¡×¤×§×˜×™× × ×¢×¨×›×• ×‘×”×¦×œ×—×”."
+          failure: "×¢×¨×™×›×ª ×”×”×™×‘×˜ × ×›×©×œ×” ×¢×‘×•×¨ ×”×—×‘×¨ %{real_name}."
+          success: "×”×”×™×‘×˜×™× × ×¢×¨×›×• ×‘×”×¦×œ×—×”."
       move_friend:
           failure: "×œ× ×¢×‘×“ %{inspect}"
-          success: "××ª×” ×›×¢×ª ×ž×¦×™×’ ×œ×—×‘×¨×š ××¡×¤×§×˜ ×©×•× ×” ×©×œ×š."
+          success: "×›×¢×ª ×™×•×¤×™×¢ ×‘×¤× ×™ ×”×—×‘×¨×™× ×©×œ×š ×”×™×‘×˜ ××—×¨ ×©×œ×š."
       helper:
-          remove: "×ž×—×§"
-          aspect_not_empty: "××¡×¤×§×˜ ×œ× ×¨×™×§"
+          remove: "×”×¡×¨×”"
+          aspect_not_empty: "×”×”×™×¡×˜ ××™× ×• ×¨×™×§"
   users:
       edit:
-          cancel: "×‘×˜×œ"
-          update_profile: "×¢×“×›×Ÿ ×¤×¨×•×¤×™×œ"
+          cancel: "×‘×™×˜×•×œ"
+          update_profile: "×¢×“×›×•×Ÿ ×”×¤×¨×•×¤×™×œ"
           home: "×‘×™×ª"
-          diaspora_username: "×©× ×ž×©×ª×ž×© ×‘×“×™××¡×¤×•×¨×”"
-          info: "×ž×™×“×¢"
+          diaspora_username: "×©× ×”×ž×©×ª×ž×© ×‘×“×™××¡×¤×•×¨×”"
+          info: "×¤×¨×˜×™×"
           picture: "×ª×ž×•× ×”"
-          editing_profile: "×¢×•×¨×š ×¤×¨×•×¤×™×œ"
+          editing_profile: "×¢×¨×™×›×ª ×”×¤×¨×•×¤×™×œ"
           albums: "××œ×‘×•×ž×™×"
-          you_dont_have_any_photos: "××™×Ÿ ×œ×š ×ª×ž×•× ×•×ª! ×¢×‘×•×¨ ×œ-"
-          page_to_upload_some:  "×“×£ ×œ×”×¢×œ××”."
+          you_dont_have_any_photos: "××™×Ÿ ×œ×š ×ª×ž×•× ×•×ª!  ×‘××¤×©×¨×•×ª×š ×œ×’×©×ª ×œ×¢×ž×•×“"
+          page_to_upload_some:  "×›×“×™ ×œ×”×¢×œ×•×ª ×›×ž×”."
   comments:
       comment:
           ago: "×œ×¤× ×™"
@@ -114,88 +119,88 @@ he:
           comment: "×”×¢×¨×”"
   photos:
       show:
-          prev: "×§×•×“×"
+          prev: "×”×§×•×“×ž×ª"
           full_size: "×’×•×“×œ ×ž×œ×"
-          next: "×”×‘×"
-          edit_photo: "×¢×¨×•×š ×ª×ž×•× ×”"
-          delete_photo: "×ž×—×§ ×ª×ž×•× ×”"
-          are_you_sure: "×”×× ××ª×” ×‘×˜×•×—?"
+          next: "×”×‘××”"
+          edit_photo: "×¢×¨×™×›×ª ×ª×ž×•× ×”"
+          delete_photo: "×ž×—×™×§×ª ×ª×ž×•× ×”"
+          are_you_sure: "×‘×‘×˜×—×”?"
           comments: "×”×¢×¨×•×ª"
       edit:
           editing: "×¢×¨×™×›×”"
-          are_you_sure: "×”×× ××ª×” ×‘×˜×•×—?"
-          delete_photo: "×ž×—×§ ×ª×ž×•× ×”"
+          are_you_sure: "×‘×‘×˜×—×”?"
+          delete_photo: "×ž×—×™×§×ª ×ª×ž×•× ×”"
       photo:
-          show_comments: "×”×¦×’ ×”×¢×¨×•×ª"
-          posted_a_new_photo_to: "×”×•×¢×œ×ª×” ×ª×ž×•× ×” ×—×“×©×” ×œ-"
+          show_comments: "×”×¦×’×ª ×”×¢×¨×•×ª"
+          posted_a_new_photo_to: "×¤×•×¨×¡×ž×” ×ª×ž×•× ×” ×—×“×©×” ××œ"
       new:
           new_photo: "×ª×ž×•× ×” ×—×“×©×”"
-          back_to_list: "×—×¨×” ×œ×¨×©×™×ž×”"
-          post_it: "×©×ª×£!"
+          back_to_list: "×—×–×¨×” ×œ×¨×©×™×ž×”"
+          post_it: "×¤×¨×¡×•×!"
       create:
-          runtime_error: "×”×¢×œ××ª ×ª×ž×•× ×” × ×›×©×œ×”. ×”×× ××ª×” ×—×•×’×¨ ×—×’×•×¨×ª ×‘×˜×™×—×•×ª?"
-          integrity_error: "×”×¢×œ××ª ×ª×ž×•× ×” × ×›×©×œ×”. ×”×× ×–×• ××›×Ÿ ×”×™×™×ª×” ×ª×ž×•× ×”?"
-          type_error: "×”×¢×œ××ª ×ª×ž×•× ×” × ×›×©×œ×”. ×”×× ××›×Ÿ × ×•×¡×¤×” ×ª×ž×•× ×”?"
+          runtime_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×”×—×’×•×¨×” ×©×œ×š ×ž×”×•×“×§×ª?"
+          integrity_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×–×• ×‘××ž×ª ×”×™×™×ª×” ×ª×ž×•× ×”?"
+          type_error: "×”×¢×œ××ª ×”×ª×ž×•× ×” × ×›×©×œ×”.  ×”×× ×‘××ž×ª × ×•×¡×¤×” ×ª×ž×•× ×”?"
       update:
-          notice: "×ª×ž×•× ×” ×¢×•×“×›× ×” ×‘×”×¦×œ×—×”."
-          error:  "×¢×¨×™×›×ª ×ª×ž×•× ×” × ×›×©×œ×”."
+          notice: "×”×ª×ž×•× ×” ×¢×•×“×›× ×” ×‘×”×¦×œ×—×”."
+          error:  "××™×¨×¢ ×›×©×œ ×‘×¢×¨×™×›×ª ×”×ª×ž×•× ×”."
       destroy:
-          notice: "×ª×ž×•× ×” × ×ž×—×§×”."
+          notice: "×”×ª×ž×•× ×” × ×ž×—×§×”."
   registrations:
       new:
-          sign_up: "×”×¦×˜×¨×¤×•×ª"
+          sign_up: "×”×¨×©×ž×”"
       create:
           success: "×”×¦×˜×¨×¤×ª ×œ×“×™××¡×¤×•×¨×”!"
   status_messages:
       new_status_message:
-          tell_me_something_good: "×¡×¤×¨ ×œ×™ ×ž×©×”×• × ×—×ž×“"
+          tell_me_something_good: "×‘× ×œ×™ ×œ×©×ž×•×¢ ×¡×™×¤×•×¨ ×˜×•×‘"
           oh_yeah: "××—×œ×”!"
       status_message:
-          show_comments: "×”×¦×’ ×ª×’×•×‘×•×ª"
-          delete: "×ž×—×§"
-          are_you_sure: "×”×× ××ª×” ×‘×˜×•×—?"
+          show_comments: "×”×¦×’×ª ×”×¢×¨×•×ª"
+          delete: "×ž×—×™×§×”"
+          are_you_sure: "×‘×‘×˜×—×”?"
       show:
-          status_message: "×”×•×“×¢×ª ×¡×˜×˜×•×¡"
+          status_message: "×”×•×“×¢×ª ×ž×¦×‘"
           comments: "×”×¢×¨×•×ª"
-          are_you_sure: "×”×× ××ª×” ×‘×˜×•×—?"
-          destroy: "×”×©×ž×“"
-          view_all: "×”×¦×’ ×”×›×œ"
+          are_you_sure: "×‘×‘×˜×—×”?"
+          destroy: "×”×¨×™×‘×”"
+          view_all: "×¦×¤×™×™×” ×‘×›×•×œ"
           message: "×”×•×“×¢×”"
           owner: "×‘×¢×œ×™×"
       helper:
-          no_message_to_display: "××™×Ÿ ×”×•×“×¢×” ×œ×”×¦×™×’."
+          no_message_to_display: "××™×Ÿ ×”×•×“×¢×” ×œ×”×¦×’×”."
   people:
       person:
-          add_friend: "×”×•×¡×£ ×—×‘×¨"
-          pending_request: "×‘×§×©×” ×¢×œ ×ª× ××™"
+          add_friend: "×”×•×¡×¤×ª ×—×‘×¨"
+          pending_request: "×‘×§×©×” ×ž×ž×ª×™× ×”"
       index:
-          add_friend: "×”×•×¡×£ ×—×‘×¨"
-          real_name: "×©× ××ž×™×ª×™"
+          add_friend: "×”×•×¡×¤×ª ×—×‘×¨"
+          real_name: "×©× ××ž×ª×™"
           diaspora_handle: "×›×™× ×•×™ ×‘×“×™××¡×¤×•×¨×”"
-          thats_you: "×–×” ××ª×”!"
-          friend_request_pending: "×‘×§×©×ª ×—×‘×¨×•×ª ×ž×ž×ª×™× ×”"
+          thats_you: "×ž×“×•×‘×¨ ×‘×š!"
+          friend_request_pending: "×‘×§×©×ª ×”×—×‘×¨×•×ª ×ž×ž×ª×™× ×”"
           you_have_a_friend_request_from_this_person: "×™×© ×œ×š ×‘×§×©×ª ×—×‘×¨×•×ª ×ž××“× ×–×”"
       new:
           new_person: "××“× ×—×“×©"
           back_to_list: "×—×–×¨×” ×œ×¨×©×™×ž×”"
       show:
-          last_seen: "× ×¨××” ×œ××—×¨×•× ×”: %{how_long_ago}"
+          last_seen: "×¤×¢×™×œ×•×ª ××—×¨×•× ×”: %{how_long_ago}"
           friends_since: "×—×‘×¨×™× ×ž××–: %{how_long_ago}"
-          save: "×©×ž×•×¨"
-          are_you_sure: "×”×× ××ª×” ×‘×˜×•×—?"
-          remove_friend: "×ž×—×§ ×—×‘×¨"
+          save: "×©×ž×™×¨×”"
+          are_you_sure: "×‘×‘×˜×—×”?"
+          remove_friend: "×”×¡×¨×ª ×—×‘×¨"
   requests:
       new_request:
-          add_a_new_friend_to: "×”×•×¡×£ ×—×‘×¨ ×—×“×© ×œ-"
-          enter_a_diaspora_username: "×”×›× ×¡ ×©× ×ž×©×ª×ž×© ×‘×“×™××¡×¤×•×¨×”:"
-          your_diaspora_username_is: "×©× ×”×ž×©×ª×ž×© ×©×œ×š ×‘×“×™××¡×¤×•×¨×”: %{diaspora_handle}"
-          friends_username: "×©× ×”×ž×©×ª×ž×© ×©×œ ×—×‘×¨"
+          add_a_new_friend_to: "×”×•×¡×¤×ª ×—×‘×¨ ×—×“×© ××œ"
+          enter_a_diaspora_username: "× × ×œ×”×–×™×Ÿ ×©× ×ž×©×ª×ž×© ×‘×“×™××¡×¤×•×¨×”:"
+          your_diaspora_username_is: "×©× ×”×ž×©×ª×ž×© ×©×œ×š ×‘×“×™××¡×¤×•×¨×” ×”×•×: %{diaspora_handle}"
+          friends_username: "×©× ×”×ž×©×ª×ž×© ×©×œ ×”×—×‘×¨"
       destroy:
-          success: "××ª× ×›×¢×ª ×—×‘×¨×™×."
-          error: "× × ×œ×‘×—×•×¨ ××¡×¤×§×˜!"
-          ignore: "×”×ª×¢×œ×ž×ª ×ž×‘×§×©×ª ×—×‘×¨×•×ª."
+          success: "××ª× ×—×‘×¨×™× ×›×¢×ª."
+          error: "× × ×œ×‘×—×•×¨ ×‘×”×™×‘×˜!"
+          ignore: "×‘×§×©×•×ª ×—×‘×¨×•×ª ×ž×”×Ÿ ×”×ª×¢×œ×ž×ª."
       create:
-          error: "×œ× × ×ž×¦× ×–×¨×¢ ×“×™××¡×¤×•×¨×” ×¢× ××™×ž×™×™×œ ×–×”!"
-          already_friends: "××ª/×” ×›×‘×¨ ×—×‘×¨ ×©×œ %{destination_url}!"
-          success: "×‘×§×©×ª ×—×‘×¨×•×ª × ×©×œ×—×” ×œ%{destination_url}."
-          horribly_wrong: "×ž×©×”×• ×¨×¢ ×ž××•×“ ×§×¨×”."
+          error: "×œ× × ×ž×¦× ×–×¨×¢ ×©×œ ×“×™××¡×¤×•×¨×” ×‘×›×ª×•×‘×ª ×“×•××´×œ ×–×•!"
+          already_friends: "××ª/×” ×•%{destination_url} ×›×‘×¨ ×—×‘×¨×™×!"
+          success: "×‘×§×©×ª ×—×‘×¨×•×ª × ×©×œ×—×” ××œ %{destination_url}."
+          horribly_wrong: "×ž×©×”×• ×”×©×ª×‘×© ×œ×’×ž×¨×™."