diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f3ab969bf..0b784b4bd 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -54,7 +54,7 @@
         - if current_user
           #global_search
             = form_tag(people_path, :method => 'get') do
-              = text_field_tag 'q', nil, :placeholder => t('.search'), :type => 'search', :results => 5
+              = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
 
           %ul#user_menu
             .avatar
diff --git a/app/views/people/edit.html.haml b/app/views/people/edit.html.haml
index a888c3fba..ac9a27763 100644
--- a/app/views/people/edit.html.haml
+++ b/app/views/people/edit.html.haml
@@ -34,7 +34,7 @@
       %h4
         = t('.your_birthday')
         %br
-        = select_date @person.profile.birthday, :prompt => true, :default => true, :order => [:month, :day, :year], :start_year => 2000, :end_year => 1930
+        = select_date @person.profile.birthday, :prompt => true, :default => true, :order => t('date.order'), :start_year => 2000, :end_year => 1930
 
       %h4
         = t('.your_bio')
@@ -45,7 +45,7 @@
         = render 'people/profile_photo_upload', :form => profile
 
       %h4
-        = t('.search')
+        = t('search')
         %p{:class=>"checkbox_select"}
           = profile.label :searchable, t('.allow_search')
           = profile.check_box :searchable, {:checked => @person.profile.searchable}, true, false
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 5030c2c03..b5079fba0 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -8,3 +8,4 @@
   = post.caption
 
 = link_to "view all of #{post.person.real_name}'s photos", person_photos_path(post.person), :class => "small_text"
+
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index 0b2f75347..85fd62688 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -3,4 +3,3 @@
 -#   the COPYRIGHT file.
 
 = markdownify(post.message)
-
diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml
index ac6d7c6af..d1be8a46f 100644
--- a/app/views/users/getting_started.html.haml
+++ b/app/views/users/getting_started.html.haml
@@ -30,7 +30,7 @@
 
 .span-8.append-1.last
   %h1{:style => "text-align:right;"}
-    = "Welcome to Diaspora!"
+    = t('.welcome')
     .description
       =t('.signup_steps')
 
@@ -59,7 +59,7 @@
     = render "users/getting_started/step_#{@step}", :current_user => current_user
 
     - if @step > 1
-      = link_to "Back", getting_started_path(:step => @step-1), :class => "button", :id => "previous_step"
+      = link_to t('back'), getting_started_path(:step => @step-1), :class => "button", :id => "previous_step"
 
 .bottom_notification
-  = link_to "skip getting started →", '#', :id => "getting_started_skip"
+  = link_to "#{t('.skip')} →", '#', :id => "getting_started_skip"
diff --git a/app/views/users/getting_started/_step_1.html.haml b/app/views/users/getting_started/_step_1.html.haml
index fb3099626..1ebfddd2d 100644
--- a/app/views/users/getting_started/_step_1.html.haml
+++ b/app/views/users/getting_started/_step_1.html.haml
@@ -5,44 +5,44 @@
 
 = form_for @person, :html => { :multipart => true } do |person|
   %h3
-    Your Profile
+    = t('.your_profile')
     .description
-      This info will be available to whomever you connect with on Diaspora.
+      = t('.info')
 
   = person.error_messages
 
   = person.fields_for :profile do |profile|
     %h4
-      Your name
-      = profile.text_field :first_name, :value => @profile.first_name, :placeholder => "First name"
-      = profile.text_field :last_name, :value => @profile.last_name, :placeholder => "Last name"
+      = t('.your_name')
+      = profile.text_field :first_name, :value => @profile.first_name, :placeholder => t('.first_name')
+      = profile.text_field :last_name, :value => @profile.last_name, :placeholder => t('.last_name')
 
     %h4
-      Your gender
+      = t('.your_gender')
       %br
       = profile.text_field :gender, :value => @profile.gender, :placeholder => t("fill_me_out")
 
     %h4
-      Your birthday
+      = t('.your_birthday')
       %br
-      = select_date @person.profile.birthday, :prompt => true, :default => true, :order => [:month, :day, :year], :start_year => 2000, :end_year => 1930
+      = select_date @person.profile.birthday, :prompt => true, :default => true, :order => t('date.order'), :start_year => 2000, :end_year => 1930
 
     %h4
-      Your bio
-      = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t(".fill_me_out")
+      = t('.your_bio')
+      = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('fill_me_out')
 
     %h4
-      Your photo
+      = t('.your_photo')
       = 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_searchable')
         = profile.check_box :searchable, {:checked => @person.profile.searchable}, true, false
 
     = hidden_field_tag :getting_started, @step
 
   .submit_block
-    = person.submit "Save and continue →"
+    = person.submit "#{t('.save_and_continue')} →"
 
diff --git a/app/views/users/getting_started/_step_2.html.haml b/app/views/users/getting_started/_step_2.html.haml
index 1498a626b..2b4f8b841 100644
--- a/app/views/users/getting_started/_step_2.html.haml
+++ b/app/views/users/getting_started/_step_2.html.haml
@@ -4,15 +4,15 @@
 
 
 %h3
-  Your aspects
+  = t('.your_aspects')
   .description
-    Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others.
+    = t('.description')
 
 %h4
-  Aspect name
+  = t('.aspect_name')
   = form_for Aspect.new, :remote => true, :format => :json do |aspect|
     = aspect.text_field :name, :style => "display:inline;"
-    = aspect.submit "Add"
+    = aspect.submit t('.add')
 
 %ul.aspects
   - for aspect in @aspects
@@ -22,7 +22,7 @@
         - for friend in aspect.person_objects
           = person_image_link(friend)
 
-        = link_to (image_tag('add_friend_button.png', :title => "add to #{aspect}")), '#manage_aspect_contacts_pane', :class => 'manage_aspect_contacts_button'
+        = link_to (image_tag('add_friend_button.png', :title => t('.add_to', :aspect => aspect))), '#manage_aspect_contacts_pane', :class => 'manage_aspect_contacts_button'
 
         .fancybox_content
           #manage_aspect_contacts_pane
@@ -34,5 +34,5 @@
 %br
 
 .submit_block
-  = link_to "Save and continue →", getting_started_path(:step => 3), :class => "button"
+  = link_to "#{t('.save_and_continue')} →", getting_started_path(:step => 3), :class => "button"
 
diff --git a/app/views/users/getting_started/_step_3.html.haml b/app/views/users/getting_started/_step_3.html.haml
index 18789da19..25440cd12 100644
--- a/app/views/users/getting_started/_step_3.html.haml
+++ b/app/views/users/getting_started/_step_3.html.haml
@@ -4,20 +4,20 @@
 
 
 %h3
-  Your services
+  = t('.your_services')
   .description
-    Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select "public."
+    = t('.description')
 %ul#stream
   - for service in @services
     %h3
       %b= service.provider
-      logged in as
+      = t('.logged_in_as')
       %b= service.nickname
-      = link_to "disconnect", service, :confirm => "disconnect #{service.provider}?", :method => :delete
+      = link_to t('.disconnect'), service, :confirm => t('.disconnect_from', :service => service.provider), :method => :delete
 
-%h4= link_to "Connect to twitter", "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
-%h4= link_to "Connect to facebook", "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
+%h4= link_to t('.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
+%h4= link_to t('.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 
 .submit_block
-  = link_to "Save and continue →", getting_started_path(:step => 4), :class => "button"
+  = link_to "#{t('.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"
 
diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml
index fed321aea..41810f69d 100644
--- a/app/views/users/getting_started/_step_4.html.haml
+++ b/app/views/users/getting_started/_step_4.html.haml
@@ -4,9 +4,9 @@
 
 
 %h1
-  = "You're all set up, #{current_user.person.profile.first_name}!"
+  = t('.set_up', :name => current_user.person.profile.first_name)
   .description
-    You're now ready to start sharing with 
+    = t('.ready_to_share')
     %ul.inline_aspect_listing
       - for aspect in @aspects
         %li= aspect
@@ -15,22 +15,22 @@
 %br
 
 %h3
-  = link_to "Continue on to your everyone page, an overview of all of your aspects.", root_path
+  = link_to t('.continue'), root_path
 
 %br
 %br
 %br
 
 %p
-  You can change your profile any time by clicking
-  %b edit profile
-  in your user menu (top right).
+  = t('.change_profile')
+  %b #{t('.edit_profile')}
+  = t('.user_menu')
 %p
-  You can connect/disconnect your services any time by clicking
-  %b edit account
-  in your user menu (top right).
+  = t('.connect_disconnect')
+  %b #{t('.edit_account')}
+  = t('.user_menu')
 %p
-  You can manage your aspects any time by clicking the
-  %b manage
-  tab.  Your contacts can also be added while on a particular aspect page, as well.
+  = t('.manage_aspects')
+  %b #{t('.manage')}
+  = t('.tab_also_added')
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b8d6fcc0b..2dad3e965 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -23,6 +23,9 @@ en:
   password_confirmation: "Password confirmation"
   are_you_sure: "Are you sure?"
   fill_me_out: "Fill me out"
+  back: "Back"
+  the_world: "the world"
+  search: "Search"
   
   activemodel:
       errors:
@@ -51,7 +54,6 @@ en:
           view_profile: "view profile"
           edit_profile: "edit profile"
           account_settings: "account settings"
-          search: "Search"
           logout: "logout"
   shared:
       stream_element:
@@ -142,10 +144,52 @@ en:
           download_photos: "download my photos"
       destroy: "Account successfully closed."
       getting_started:
+          welcome: "Welcome to Diaspora!"
           signup_steps: "Complete your sign-up by doing these things:"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
           connect_services: "Connect your services"
+          skip: "skip getting started"
+          step_1:
+              your_profile: "Your Profile"
+              info: "This info will be available to whomever you connect with on Diaspora."
+              your_name: "Your name"
+              first_name: "First name"
+              last_name: "Last name"
+              your_gender: "Your gender"
+              your_birthday: "Your birthday"
+              your_bio: "Your bio"
+              your_photo: "Your photo"
+              allow_searchable: "Allow for people to search for you"
+              save_and_continue: "Save and continue"
+          step_2:
+              your_aspects: "Your aspects"
+              description: "Tell Diaspora what different aspects of you are seen by different friends.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+              aspect_name: "Aspect name"
+              add: "Add"
+              add_to: "add to %{aspect}"
+              save_and_continue: "Save and continue"
+          step_3:
+              your_services: "Your services"
+              description: 'Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select "public."'
+              logged_in_as: "logged in as"
+              disconnect: "disconnect"
+              disconnect_from: "disconnect %{service}?"
+              connect_to_twitter: "Connect to twitter"
+              connect_to_facebook: "Connect to facebook"
+              save_and_continue: "Save and continue"
+          step_4:
+              set_up: "You're all set up, %{name}!"
+              ready_to_share: "You're now ready to start sharing with "
+              continue: "Continue on to your everyone page, an overview of all of your aspects."
+              change_profile: "You can change your profile any time by clicking"
+              edit_profile: "edit profile"
+              user_menu: "in your user menu (top right)."
+              connect_disconnect: "You can connect/disconnect your services any time by clicking"
+              edit_account: "edit account"
+              manage_aspects: "You can manage your aspects any time by clicking the"
+              manage: "manage"
+              tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
       update:
           password_changed: "Password Changed"
           password_not_changed: "Password Change Failed"
@@ -208,7 +252,6 @@ en:
           oh_yeah: "oh yeah!"
       status_message:
           show_comments: "show comments"
-          the_world: "the world"
       show:
           destroy: "Destroy"
       helper:
@@ -245,7 +288,6 @@ en:
           your_bio: "Your bio"
           your_photo: "Your photo"
           update_profile: "Update Profile"
-          search: "Search"
           allow_search: "Allow for people to search for you"
       profile_photo_upload:
           or_select_one: "or select one from your already existing"
@@ -287,3 +329,5 @@ en:
   dashboards:
       helper:
           home: "Home"
+  date:
+      order: [:month, :day, :year]