added getting_started text and new press logos

app/views/devise/sessions/new.haml

@@ -30,9 +30,10 @@
 
 .span-13.last
   %h1
-    This is a technology preview, do not provide any private information.
+  = t('.tech_preview')
   %h3
-    your account may be deleted until we move into a more stable development period.
+  = t('.account_deletion') 
   %h3
-    USE AT YOUR OWN RISK!!
+  = t('.risk') 
+    
 

app/views/shared/_aspect_contacts.haml

@@ -49,7 +49,7 @@
 
 - if (aspect == :all) && @request_count > 0
   #new_request_pane{:class => "everyone"}
-    %h1.new_request
+    %h1.new_request{:style => 'text-align:center'}
       - if @request_count > 1
         = link_to t('.new_requests', :count => @request_count), aspects_manage_path
       - else

app/views/users/getting_started/_step_4.html.haml

@@ -23,16 +23,10 @@
 
 %p
   = t('.change_profile')
-  %b #{t('layouts.header.edit_profile')}
-  = t('.user_menu')
-%p
-  = t('.connect_disconnect')
-  %b #{t('layouts.header.account_settings')}
   = t('.user_menu')
+
 %p
   = t('.manage_aspects')
-  %b #{t('.manage')}
-  = t('.tab_also_added')
 
 .submit_block
   = link_to "#{t('.finish')} →", root_url, :class => "button"

config/locales/devise/devise.en.yml

@@ -22,6 +22,9 @@ en:
         sign_in: 'Sign in'
         have_a_problem: "Have a problem? Find an answer here"
         remember_me: "Remember me"
+        tech_preview: "Important, please read: This is a technology preview; do not provide any private information."
+        account_deletion: "Also, be advised that your account may be deleted until we move into a more stable development period."
+        risk: "USE AT YOUR OWN RISK!!!"
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -83,4 +86,4 @@ en:
         sign_up: 'Sign up'
         forgot_your_password: 'Forgot your password?'
         receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"

config/locales/diaspora/en.yml

@@ -121,7 +121,7 @@ en:
           contact: "contact"
           contacts: "contacts"
       no_contacts_message:
-          nobody: "We know you know people — bring them to Diaspora!"
+          nobody: "Bring the people that matter in your life to Diaspora!"
           nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
           add_contact: "Add a contact"
           add_contact_to: "Add someone to %{aspect_name}"
@@ -177,32 +177,30 @@ en:
       destroy: "Account successfully closed."
       getting_started:
           welcome: "Welcome to Diaspora!"
-          signup_steps: "Complete your sign-up by doing these things:"
+          signup_steps: "Finish your sign up by completing these three steps:"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
-          connect_services: "Connect your services"
+          connect_services: "Connect your other services"
           finished: "Finished!"
           skip: "skip getting started"
           save_and_continue: "Save and continue"
           step_2:
               your_aspects: "Your aspects"
-              description: "Tell Diaspora what different aspects of you are seen by different contacts.  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."
+              description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
               aspect_name: "Aspect name"
               add: "Add"
           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."'
+              description: 'You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public"'
           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"
-              user_menu: "in your user menu (top right)."
+              continue: "Continue on to your Home page, an overview of all of your aspects."
+              change_profile: "You can edit your profile and manage your connected services at any time through "
+              user_menu: "the user menu located at the top right."
               connect_disconnect: "You can connect/disconnect your services any time by clicking"
-              manage_aspects: "You can manage your aspects any time by clicking the"
-              tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+              manage_aspects: "You can also add contacts while on any aspect page."
               finish: "Finish"
-              manage: "Manage"
       update:
           password_changed: "Password Changed"
           password_not_changed: "Password Change Failed"

features/signs_up.feature

@@ -31,9 +31,9 @@ Feature: new user registration
     Then I should see "You're all set up, O!"
     And I should not see "skip getting started"
 
-    When I follow "Continue on to your everyone page, an overview of all of your aspects."
+    When I follow "Continue on to your Home page, an overview of all of your aspects."
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"
 
   Scenario: new user skips the setup wizard and returns to the setup wizard
     When I follow "skip getting started"
@@ -44,4 +44,4 @@ Feature: new user registration
     When I follow "skip getting started"
     And I wait for the aspects page to load
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"