diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index 77ca7750d..b64ada165 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -7,8 +7,7 @@
   = javascript_include_tag 'aspect-edit.js'
 
 #section_header
-  %h2
-    Manage aspects
+  %h2=t('.manage_aspects')
   .right
     = link_to("+ #{t('.add_a_new_aspect')}", "#add_aspect_pane", :class => "new_aspect add_aspect_button button", :title => t('.add_a_new_aspect'))
 
@@ -18,7 +17,7 @@
   .requests
     %ul.dropzone
       - if @remote_requests.size < 1
-        %li No new requests
+        %li=t('.no_requests')
       - else
         - for request in @remote_requests
           %li.person.request{:data=>{:guid=>request.id, :person_id=>request.person.id}}
@@ -28,11 +27,11 @@
               .circle
             = person_image_tag(request.person)
 
-  %h3 Remove from Aspect
+  %h3=t('.remove_from_aspect')
   .aspect_remove
     %ul.dropzone
       .draggable_info
-        Drag to remove person from aspect
+        =t('.drag_to_remove')
 
   = render 'shared/invitations', :invites => @invites
 
@@ -61,7 +60,7 @@
                 .circle
               = person_image_tag(person)
           .draggable_info
-            Drag to add people
+            =t('.drag_to_add')
 
 
 
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index d9431bbb8..ba7e29dba 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -1,12 +1,12 @@
 .span-12.prepend-6.last
   .floating
     %h3
-      Forgot your password?
+      =t('.forgot_password')
     = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
       = devise_error_messages!
       %p
         = f.label :email
         = f.text_field :email
       %p
-      = f.submit "Send me reset password instructions"
+      = f.submit t('.send_password_instructions')
     = render :partial => "devise/shared/links"
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index 595fba52d..3a6a47cdc 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -22,7 +22,7 @@
     %p
       = render :partial => "devise/shared/links"
     %p
-      = link_to "Have a problem? Find an answer here", 'http://diaspora.shapado.com/'
+      = link_to t('.have_a_problem'), 'http://diaspora.shapado.com/'
 
 .span-13.last
   %h1
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index b08a2db61..ab45b50a3 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -12,9 +12,9 @@
 
       .right{:style=>"display:inline;"}
         - if person.id == current_user.person.id
-          thats you!
+          = t('.thats_you')
         - elsif current_user.friends.include?(person)
-          Already friends
+          = t('.already_friends')
         - elsif current_user.pending_requests.find_by_person_id(person.id)
           = link_to =t('.pending_request'), aspects_manage_path
         - else
diff --git a/app/views/people/_profile_photo_upload.html.haml b/app/views/people/_profile_photo_upload.html.haml
index cd9577abe..d2f946334 100644
--- a/app/views/people/_profile_photo_upload.html.haml
+++ b/app/views/people/_profile_photo_upload.html.haml
@@ -8,6 +8,6 @@
   = form.file_field :image
 
   %p
-    \...or select one from your already existing
-    = link_to 'photos', person_photos_path(@person)
+    \...#{t('.or_select_one')}
+    = link_to t('_photos'), person_photos_path(@person)
     \.
diff --git a/app/views/people/edit.html.haml b/app/views/people/edit.html.haml
index 79440c94e..089f2d760 100644
--- a/app/views/people/edit.html.haml
+++ b/app/views/people/edit.html.haml
@@ -45,9 +45,9 @@
         = render 'people/profile_photo_upload', :form => profile
 
       %h4
-        Search
+        = t('.search')
         %p{:class=>"checkbox_select"}
-          = profile.label :searchable, "Allow for people to search for you"
+          = profile.label :searchable, t('.allow_search')
           = profile.check_box :searchable, {:checked => @person.profile.searchable}, true, false
 
     .submit_block
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index e2d4e2656..f5c3fd5e6 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -4,7 +4,7 @@
 
 .span-15.prepend-5.last
   %h2
-    search results for
+    =t('.results_for')
     %u= params[:q]
 
   %ul#stream
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 84b9d5914..ab936407f 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -36,7 +36,7 @@
 
     %br
     %br
-    = link_to 'photos', person_photos_path(@person)
+    = link_to t('_photos'), person_photos_path(@person)
 
 
 .span-15.last
@@ -55,13 +55,13 @@
     
     .floating
       %h3
-        = "You're currently not friends with #{@person.real_name}"
+        = t('.not_friends', :name => @person.real_name)
         
 
       - unless @pending_request
         %h3
           .description
-            If you'd like, you can request to place him/her in one of your aspects.
+            = t('.request_people')
          
         = form_for Request.new do |f|
           = f.select(:aspect_id, @aspects_dropdown_array)
@@ -71,5 +71,5 @@
       - else
         %h3
           .description
-            = "You have already sent a request to #{@person.real_name}."
+            = t('.already_requested', :name => @person.real_name)
 
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index d3d676f86..f71bbad97 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -13,7 +13,7 @@
         ➔
         %ul
           - if post.public?
-            the world
+            %li= t('.the_world')
           - else
             - for aspect in current_user.aspects_with_post( post.id )
               %li= link_to aspect.name, aspect
@@ -22,7 +22,7 @@
         .right
           = link_to t('delete'), photo_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
-    posted a photo
+      =t('.posted_a_photo')
 
     %br
     %br
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index f4da75b2c..03e5438b3 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -9,7 +9,7 @@
 = render 'shared/author_info', :person => @photo.person, :post => @photo
 
 %ul#breadcrumb
-  %li= link_to "#{@photo.person.profile.first_name}'s Photos", person_photos_path(@photo.person)
+  %li= link_to "#{@photo.person.profile.first_name}'s #{t('_photos')}", person_photos_path(@photo.person)
   %li= @photo.caption
 
 / we need to do next photo here
@@ -27,7 +27,7 @@
       -if @ownership
         .edit_pane
           .controls{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_medium)}"}}
-            = link_to 'make profile photo', '#', :class => "make_profile_photo"
+            = link_to t('.make_profile_photo'), '#', :class => "make_profile_photo"
           = image_tag @photo.url(:scaled_full)
 
       -else
@@ -36,21 +36,21 @@
       .caption
         -if @ownership
           -if @photo.caption and @photo.caption != ""
-            = link_to 'Edit','javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
+            = link_to t('.edit_photo'),'javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
         .description
           = @photo.caption
 
   -if @ownership
     %div{:class => 'clear'}
     -if !@photo.caption or @photo.caption == ""
-      = link_to 'Add a description','javascript:void(0)', :id => "add-description", :class => "edit-desc"
+      = link_to t('.add_a_description'),'javascript:void(0)', :id => "add-description", :class => "edit-desc"
 
   %br
   %br
 
   = form_for @photo do |p|
     = p.text_field :caption, :value => @photo.caption
-    = p.submit
+    = p.submit t('.update_photo')
     %div{:class => 'clear'}
 
   -if @ownership
diff --git a/app/views/shared/_add_friend_dropdown.html.haml b/app/views/shared/_add_friend_dropdown.html.haml
index f324b988c..c8ae09f4f 100644
--- a/app/views/shared/_add_friend_dropdown.html.haml
+++ b/app/views/shared/_add_friend_dropdown.html.haml
@@ -4,4 +4,4 @@
   = hidden_field_tag :aspect_id, aspect.id
   - if defined?(manage) && manage
     = hidden_field_tag :manage, true
-  = submit_tag "add to #{aspect.name}"
+  = submit_tag t('.add_to', :aspect => aspect.name)
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index b28997470..802cd1001 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -4,7 +4,7 @@
 
 
 #left_pane
-  %h2= aspect == :all ? "Everyone" : aspect
+  %h2= aspect == :all ? t('.everyone') : aspect
 
   .friend_pictures
     = owner_image_link
@@ -13,7 +13,7 @@
       = person_image_link(friend)
 
     -unless (aspect == :all)
-      = link_to (image_tag('add_friend_button.png', :title => "add to #{@aspect}")), "#add_request_pane", :class => 'add_request_button'
+      = link_to (image_tag('add_friend_button.png', :title => "#{t('.add_to', :aspect => @aspect)}")), "#add_request_pane", :class => 'add_request_button'
 
       .fancybox_content
         #add_request_pane
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 2c960a5db..5d8a7f24d 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -5,12 +5,12 @@
 #aspect_nav
   %ul
     %li{:class => ("selected" if @aspect == :all)}
-      = link_to "Everyone", root_url
+      = link_to t('.everyone'), root_url
     - for aspect in @aspects
       %li{:class => ("selected" if current_aspect?(aspect))}
         = link_for_aspect aspect
     %li
-      = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => "add a new aspect"
+      = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('.add_a_new_aspect')
 
   %ul.right{:style=>"bottom:0;"}
     %li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
diff --git a/app/views/shared/_public_explain.haml b/app/views/shared/_public_explain.haml
index 3d7e7f644..da63b210e 100644
--- a/app/views/shared/_public_explain.haml
+++ b/app/views/shared/_public_explain.haml
@@ -4,19 +4,19 @@
 
 .span-12.last
   .modal_title_bar
-    %h4 You are about to post a public message!
+    %h4=t('.title')
   %p
-    Public messages will be available for others outside of Diaspora to see.
+    =t('.outside')
     %br
     %br
 
     - if current_user.services
       - for service in current_user.services 
-        = "logged in to #{service.provider}"
+        = t('.logged_in', :service => service.provider)
         %br
 
-    = link_to "manage connected services", services_path
+    = link_to t('.manage'), services_path
 
     %br
     %br
-    = link_to "OK", '#', :class => "button", :onClick => '$.fancybox.close();'
+    = link_to t('ok'), '#', :class => "button", :onClick => '$.fancybox.close();'
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index ce25bc65c..76ed17835 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -25,16 +25,16 @@
   = form_for StatusMessage.new, :remote => true do |status|
     = status.error_messages
     %p
-      = status.label :message, t('.post_a_message_to', :aspect => aspect)
+      = status.label :message, t('.post_a_message_to', :aspect => (aspect == :all ? t('.all') : aspect))
       = status.text_area :message, :rows => 2, :value => params[:prefill]
 
     = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
 
     .options_and_submit
       - if aspect == :all
-        = status.submit t('.share'), :title => "Share with all aspects"
+        = status.submit t('.share'), :title => t('.share_with_all')
       - else
-        = status.submit t('.share'), :title => "Share with #{aspect}"
+        = status.submit t('.share'), :title => t('.share_with', :aspect => aspect)
 
       - if aspect == :all
         .public_toggle
@@ -50,3 +50,4 @@
   #publisher_photo_upload
     = t('or')
     = render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
+
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 634729a83..cea119d59 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -60,8 +60,8 @@
 
   %h3 
     = t('.export_data')
-  = link_to "download my xml", users_export_path, :class => "button"
-  = link_to "download my photos", users_export_photos_path, :class => "button"
+  = link_to t('.download_xml'), users_export_path, :class => "button"
+  = link_to t('.download_photos'), users_export_photos_path, :class => "button"
 
   %br
   %br
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index fa0fb577f..d47a44051 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -20,11 +20,15 @@ en:
         username: 'Username'
         password: 'Password'
         sign_in: 'Sign in'
+        have_a_problem: "Have a problem? Find an answer here"
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
       updated: 'Your password was changed successfully. You are now signed in.'
+      new:
+        forgot_password: "Forgot your password?"
+        send_password_instructions: "Send me reset password instructions"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9f41d2fe5..5a62a36ee 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -11,6 +11,9 @@ en:
   profile: "Profile"
   account: "Account"
   services: "Services"
+  _photos: "photos"
+  stream: "stream"
+  ok: "OK"
   cancel: "Cancel"
   delete: "Delete"  
   or: "or"
@@ -63,6 +66,8 @@ en:
           all_aspects: "All Aspects"
           manage: "Manage"
           manage_your_aspects: "Manage your Aspects"
+          everyone: "Everyone"
+          add_a_new_aspect: "add a new aspect"
       sub_header:
           all_aspects: "All Aspects"
           manage_aspects: "Manage Aspects"
@@ -70,9 +75,14 @@ en:
           share: "Share"
           post_a_message_to: "Post a message to %{aspect}"
           make_public: "make public"
+          share_with_all: "Share with all aspects"
+          share_with: "Share with %{aspect}"
+          create: "Create"
+          all: "all"
       aspect_friends:
           add_friends: "add friends"
-          photos: "photos"
+          everyone: "Everyone"
+          add_to: "add to %{aspect}"
       invitations:
           invites: 'Invites'
           invite_a_friend: 'Invite a friend'
@@ -81,6 +91,13 @@ en:
           reshare: 'Reshare'
       author_info:
           view_profile: 'View profile'
+      add_friend_dropdown:
+          add_to: "add to %{aspect}"
+      public_explain:
+          title: "You are about to post a public message!"
+          outside: "Public messages will be available for others outside of Diaspora to see."
+          logged_in: "logged in to %{service}"
+          manage: "manage connected services"
   aspects:
       no_friends_message:
           nobody: "We know you have friends — bring them to Diaspora!"
@@ -97,6 +114,11 @@ en:
           update_aspects: "Update Aspects"
           requests: "Requests"
           ignore_remove: "Ignore/Remove"
+          no_requests: "No new requests"
+          remove_from_aspect: "Remove from Aspect"
+          manage_aspects: "Manage aspects"
+          drag_to_remove: "Drag to remove person from aspect"
+          drag_to-add: "Drag to add people"
       new_aspect:
           add_a_new_aspect: "Add a new aspect"
           name: "Name"
@@ -126,6 +148,8 @@ en:
           change_language: "Change Language"
           change_password: "Change Password"
           new_password: "New Password"
+          download_xml: "download my xml"
+          download_photos: "download my photos"
       destroy: "Account successfully closed."
       getting_started:
           signup_steps: "Complete your sign-up by doing these things:"
@@ -143,12 +167,18 @@ en:
           edit_photo: "Edit Photo"
           delete_photo: "Delete Photo"
           comments: "comments"
+          add_a_description: "Add a description"
+          uploads: "uploads"
+          make_profile_photo: "make profile photo"
+          update_photo: "Update Photo"
       edit:
           editing: "Editing"
           delete_photo: "Delete Photo"
       photo:
           show_comments: "show comments"
           posted_a_new_photo_to: "posted a new photo to"
+          posted_a_photo: "posted a photo"
+          the_world: "the world"
       new:
           new_photo: "New Photo"
           back_to_list: "Back to List"
@@ -204,6 +234,8 @@ en:
       person:
           add_friend: "add friend"
           pending_request: "pending request"
+          already_friends: "Already friends"
+          thats_you: "thats you!"
       index:
           add_friend: "add friend"
           real_name: "real name"
@@ -211,6 +243,7 @@ en:
           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"
+          results_for: "search results for"
       new:
           new_person: "New Person"
           back_to_list: "Back to List"
@@ -222,6 +255,9 @@ en:
           no_posts: "no posts to display!"
           add_friend: "add friend"
           edit_my_profile: "Edit my profile"
+          not_friends: "You're currently not friends with %{name}"
+          request_people: "If you'd like, you can request to place him/her in one of your aspects."
+          already_requested: "You have already sent a request to %{name}."
       edit:
           info_available_to: "This info will be available to whomever you connect with on Diaspora."
           your_profile: "Your profile"
@@ -240,6 +276,10 @@ en:
           editing_profile: "Editing profile"
           you_dont_have_any_photos: "You don't have any photos!  Go to the"
           page_to_upload_some:  "page to upload some."
+          search: "Search"
+          allow_search: "Allow for people to search for you"
+      profile_photo_upload:
+          or_select_one: "or select one from your already existing"
   requests:
       new_request:
           add_a_new_friend_to: "Add a new friend to"