diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml
index 3f53c2988..5d6d1e75c 100644
--- a/app/views/layouts/application.mobile.haml
+++ b/app/views/layouts/application.mobile.haml
@@ -30,4 +30,4 @@
            
       %div{:data => {:role => 'fieldcontain'}}
         = form_tag(people_path, :method => 'get') do
-          = text_field_tag 'q', nil, :placeholder => t('.search'), :type => 'search'
+          = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search'
diff --git a/app/views/registrations/edit.html.haml b/app/views/registrations/edit.html.haml
index 9cadd779f..80da58fe5 100644
--- a/app/views/registrations/edit.html.haml
+++ b/app/views/registrations/edit.html.haml
@@ -1,5 +1,5 @@
 %h2
-  Edit #{resource_name.to_s.humanize}
+  = t('.edit', :name => resource_name.to_s.humanize)
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
   = devise_error_messages!
   %p
@@ -8,7 +8,7 @@
     = f.text_field :email
   %p
     = f.label :password
-    %i (leave blank if you don't want to change it)
+    %i = t('.leave_blank')
     %br/
     = f.password_field :password
   %p
@@ -17,12 +17,12 @@
     = f.password_field :password_confirmation
   %p
     = f.label :current_password
-    %i (we need your current password to confirm your changes)
+    %i = t('.password_to_confirm')
     %br/
     = f.password_field :current_password
   %p
   = f.submit t('.update')
 %h3 t('.cancel_my_account')
 %p
-  Unhappy? #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}.
+  = t('.unhappy') #{link_to t('.cancel_my_account'), registration_path(resource_name), :confirm => t('are_you_sure'), :method => :delete}.
 = link_to t('.back'), :back
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 498ba6bd9..9acaa0429 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -218,6 +218,14 @@ en:
           sign_up_for_diaspora: "Sign up for Diaspora"
       create:
           success: "You've joined Diaspora!"
+      edit:
+          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?"
+          back: "Back"
+          update: "Update"
+          cancel_my_account: "Cancel my account"
   invitations:
       create:
           sent: "Your invitation has been sent."