diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 379e2f3c1..01a33adbb 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -6,7 +6,7 @@
   = include_javascripts :aspects
 
 - content_for :page_title do
-  = "Manage aspects"
+  = t('.manage_aspects')
 
 #section_header
   %h2=t('.manage_aspects')
diff --git a/app/views/people/_edit.html.haml b/app/views/people/_edit.html.haml
index 6935b4601..d44dfc17e 100644
--- a/app/views/people/_edit.html.haml
+++ b/app/views/people/_edit.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
-  = "Edit profile"
+  = t('.edit_profile')
 
 = form_tag person_path(@person), :method => :put, :multipart => true, :id => 'update_profile_form' do
   %h3
diff --git a/app/views/people/_profile_photo_upload.html.haml b/app/views/people/_profile_photo_upload.html.haml
index d443b82c1..dc62ad16c 100644
--- a/app/views/people/_profile_photo_upload.html.haml
+++ b/app/views/people/_profile_photo_upload.html.haml
@@ -9,6 +9,6 @@
 
   -if !@aspect.nil? && @aspect != :getting_started 
     %p
-      \...#{t('.or_select_one')}
+      \...#{t('photos.new_profile_photo.or_select_one')}
       = link_to t('_photos'), person_photos_path(@person)
 
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index b607a02ea..07cb6b73f 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
-  = "Search"
+  = t('search')
 
 .span-15.prepend-5.last
   %h2
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 345ebd885..5e9b2c3d5 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
-  = "Edit services"
+  = t('.edit_services')
 
 #section_header
   %h2
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 087f4d814..3bb4b2652 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
-  = "Edit account"
+  = t('.edit_account')
 
 :javascript
   $(document).ready(function(){
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 3e6dd7c03..e96755e2d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -179,6 +179,7 @@ en:
           download_photos: "download my photos"
           your_handle: "Your diaspora handle"
           your_email: "Your email"
+          edit_account: "Edit account"
       destroy: "Account successfully closed."
       getting_started:
           welcome: "Welcome to Diaspora!"
@@ -334,6 +335,7 @@ en:
           your_photo: "Your photo"
           update_profile: "Update Profile"
           allow_search: "Allow for people to search for you within Diaspora"
+          edit_profile: "Edit profile"
       update:
           updated: "Profile updated"
           failed: "Failed to update profile"
@@ -369,6 +371,7 @@ en:
         really_disconnect: "disconnect %{service}?"
         connect_to_twitter: "Connect to twitter"
         connect_to_facebook: "Connect to facebook"
+        edit_services: "Edit services"
       create:
           success: "Authentication successful."
       destroy: