From ca72bb40a6e8655c39321ccdd2c7250db089cf20 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 5 Nov 2010 21:21:44 +0100
Subject: [PATCH 01/15] refactored en.yml

removed unused keys out of en.yml
replaced some ' with "
---
 app/controllers/users_controller.rb     |   2 +-
 app/views/layouts/application.html.haml |   2 +-
 app/views/services/index.html.haml      |   8 +-
 config/locales/diaspora/en.yml          | 111 ++++++++----------------
 4 files changed, 40 insertions(+), 83 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8262aac97..899e6620f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -63,7 +63,7 @@ class UsersController < ApplicationController
 
       render :xml => director.build(ostatus_builder), :content_type => 'application/atom+xml'
     else
-      flash[:error] = I18n.t 'users.public.does_not_exists', :username => params[:username]
+      flash[:error] = I18n.t 'users.public.does_not_exist', :username => params[:username]
       redirect_to root_url
     end
   end
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 561db85c7..f3ab969bf 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -63,7 +63,7 @@
             %li= link_to t('.view_profile'), current_user.person
             %li= link_to t('.edit_profile'), edit_person_path(current_user.person)
             %li= link_to t('.account_settings'), edit_user_path(current_user)
-            %li= link_to t('.logout.'), destroy_user_session_path
+            %li= link_to t('.logout'), destroy_user_session_path
 
           = render "shared/aspect_nav"
 
diff --git a/app/views/services/index.html.haml b/app/views/services/index.html.haml
index 4d002e8b4..eaf543a78 100644
--- a/app/views/services/index.html.haml
+++ b/app/views/services/index.html.haml
@@ -18,11 +18,11 @@
     - 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('.really_disconnect', :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'] !=""
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5a53dc135..6c8e46984 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -12,16 +12,13 @@ en:
   account: "Account"
   _services: "Services"
   _photos: "photos"
-  stream: "stream"
   ok: "OK"
   cancel: "Cancel"
   delete: "Delete"  
   or: "or"
-  by: "by"
   ago: "ago"
   username: "Username"
   email: "Email"
-  home: "Home"
   password: "Password"
   password_confirmation: "Password confirmation"
   are_you_sure: "Are you sure?"
@@ -41,19 +38,13 @@ en:
                   attributes:
                       diaspora_handle:
                           taken: "is already taken"
-  hello: "Hello world"
   application:
       helper:
           unknown_person: "unknown person"
-          new_requests: "new requests"
   error_messages:
       helper:
           invalid_fields: "Invalid Fields"
           correct_the_following_errors_and_try_again: "Correct the following errors and try again."
-  people:
-      helper:
-           results_for: " results for %{params}"
-           people_on_pod_are_aware_of: " people on pod are aware of"
   layouts:
       application:
           view_profile: "view profile"
@@ -66,34 +57,29 @@ en:
           show_comments: "show comments"
           the_world: "the world"
       aspect_nav:
-          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"
       publisher:
           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"
           everyone: "Everyone"
           add_to: "add to %{aspect}"
       invitations:
-          invites: 'Invites'
-          invite_a_friend: 'Invite a friend'
-          invitations_left: '(%{count} left)'
+          invites: "Invites"
+          invite_a_friend: "Invite a friend"
+          invitations_left: "(%{count} left)"
       reshare:
-          reshare: 'Reshare'
+          reshare: "Reshare"
       author_info:
-          view_profile: 'View profile'
+          view_profile: "View profile"
       add_friend_dropdown:
           add_to: "add to %{aspect}"
       public_explain:
@@ -113,15 +99,10 @@ en:
       manage:
           add_a_new_aspect: "Add a new aspect"
           add_a_new_friend:  "Add a new friend"
-          show: "Show"
-          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"
+          drag_to_add: "Drag to add people"
       new_aspect:
           add_a_new_aspect: "Add a new aspect"
           name: "Name"
@@ -136,15 +117,18 @@ en:
       move_friend:
           failure: "didn't work %{inspect}"
           success: "Person moved to new aspect"
+          error: "Error moving friend: %{inspect}"
       add_to_aspect:
           failure: "Failed to add friend to aspect."
           success: "Successfully added friend to aspect."
       helper:
           remove: "remove"
           aspect_not_empty: "Aspect not empty"
+      remove_from_aspect:
+          success: "Successfully removed person from aspect"
+          failure: "Failed to remove person from aspect"
   users:
       edit:
-          editing_profile: "Editing profile"
           invite_friends: "Invite friends"
           export_data: "Export Data"
           close_account: "Close Account"
@@ -156,9 +140,7 @@ en:
       destroy: "Account successfully closed."
       getting_started:
           signup_steps: "Complete your sign-up by doing these things:"
-          'step_1':
-              you_dont_have_any_photos: "You don't have any photos!  Go to the"
-              page_to_upload_some:  "page to upload some."
+          step_1:
               fill_me_out: "Fill me out"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
@@ -175,22 +157,16 @@ en:
           comment: "Comment"
   photos:
       show:
+          delete_photo: "Delete Photo"
           prev: "prev"
           full_size: "full size"
           next: "next"
           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:
-          posted_a_new_photo_to: "posted a new photo to"
-          posted_a_photo: "posted a photo"
       new:
           new_photo: "New Photo"
           back_to_list: "Back to List"
@@ -208,25 +184,21 @@ en:
       new:
           sign_up: "Sign up"
           sign_up_for_diaspora: "Sign up for Diaspora"
-          upload_existing_account: "Upload an existing Diaspora account"
-          upload: "Upload"
       create:
           success: "You've joined Diaspora!"
   invitations:
       create:
-          sent: 'Your invitation has been sent.'
-          no_more: 'You have no more invitations.'
-          already_sent: 'You already invited this person.'
-          already_friends: 'You are already friends with this person' 
-          invitation_token_invalid: 'The invitation token provided is not valid!'
-          updated: 'Your password was set successfully. You are now signed in.'
+          sent: "Your invitation has been sent."
+          no_more: "You have no more invitations."
+          already_sent: "You already invited this person."
+          already_friends: "You are already friends with this person" 
       new:
-          invite_someone_to_join: 'Invite someone to join Diaspora!'
-          if_they_accept_info: 'if they accept, they will be added to the aspect you invited them'
-          to: 'To'
-          message: 'Message:'
-          send_an_invitation: 'Send an invitation'
-          send_invitation: 'Send invitation'
+          invite_someone_to_join: "Invite someone to join Diaspora!"
+          if_they_accept_info: "if they accept, they will be added to the aspect you invited them"
+          to: "To"
+          message: "Message:"
+          send_an_invitation: "Send an invitation"
+          send_invitation: "Send invitation"
       check_token:
           not_found: "Invitation token not found"
   status_messages:
@@ -234,12 +206,7 @@ en:
           tell_me_something_good: "tell me something good"
           oh_yeah: "oh yeah!"
       show:
-          status_message: "Status Message"
-          comments: "comments"
           destroy: "Destroy"
-          view_all: "View All"
-          message: "Message"
-          owner: "Owner"
       helper:
           no_message_to_display: "No message to display."
   people:
@@ -249,16 +216,7 @@ en:
           already_friends: "Already friends"
           thats_you: "thats you!"
       index:
-          add_friend: "add friend"
-          real_name: "real name"
-          diaspora_handle: "diaspora handle"
-          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"
       show:
           save: "save"
           no_posts: "no posts to display!"
@@ -279,12 +237,6 @@ en:
           fill_me_out: "Fill me out"
           your_photo: "Your photo"
           update_profile: "Update Profile"
-          diaspora_username: "DIASPORA USERNAME"
-          info: "Info"
-          picture: "Picture"
-          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:
@@ -297,6 +249,9 @@ en:
           edit_my_profile: "Edit my profile"
           last_seen: "last seen: %{how_long_ago}"
           friends_since: "friends since: %{how_long_ago}"
+      helper:
+           results_for: " results for %{params}"
+           people_on_pod_are_aware_of: " people on pod are aware of"
   requests:
       manage_aspect_contacts:
           add_a_new_friend_to: "Add a new friend to"
@@ -309,16 +264,18 @@ en:
           error: "Please select an aspect!"
           ignore: "Ignored friend request."
       create:
-          error: "No diaspora seed found with this email!"
-          invalid_identity: "This identity is not properly formatted"
-          error_server: "Problem with other server. Maybe it doesn't exist?"
-          yourself: "You cannot befriend yourself!"
-          already_friends: "You are already friends with %{destination_url}!"
-          success: "A friend request was sent to %{destination_url}."
-          horribly_wrong: "Something went horribly wrong."
           tried: "we tried our best to send a message to %{account}"
   services:
+      index:
+        logged_in_as: "logged in as"
+        disconnect: "disconnect"
+        really_disconnect: "disconnect %{service}?"
+        connect_to_twitter: "Connect to twitter"
+        connect_to_facebook: "Connect to facebook"
       create:
           success: "Authentication successful."
       destroy:
           success: "Successfully destroyed authentication."
+  dashboards:
+      helper:
+          home: "Home"

From eef0901f36bfa197b9ce4b95e4db726e23972afd Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 5 Nov 2010 22:42:59 +0100
Subject: [PATCH 02/15] unscoped fill_me_out

---
 app/views/people/edit.html.haml                   | 4 ++--
 app/views/users/getting_started/_step_1.html.haml | 2 +-
 config/locales/diaspora/en.yml                    | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/people/edit.html.haml b/app/views/people/edit.html.haml
index 98089ec39..a888c3fba 100644
--- a/app/views/people/edit.html.haml
+++ b/app/views/people/edit.html.haml
@@ -29,7 +29,7 @@
       %h4
         = t('.your_gender')
         %br
-        = profile.text_field :gender, :value => @profile.gender, :placeholder => t('.fill_me_out')
+        = profile.text_field :gender, :value => @profile.gender, :placeholder => t('fill_me_out')
 
       %h4
         = t('.your_birthday')
@@ -38,7 +38,7 @@
 
       %h4
         = t('.your_bio')
-        = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('.fill_me_out')
+        = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('fill_me_out')
 
       %h4
         = t('.your_photo')
diff --git a/app/views/users/getting_started/_step_1.html.haml b/app/views/users/getting_started/_step_1.html.haml
index c377090d2..fb3099626 100644
--- a/app/views/users/getting_started/_step_1.html.haml
+++ b/app/views/users/getting_started/_step_1.html.haml
@@ -20,7 +20,7 @@
     %h4
       Your gender
       %br
-      = profile.text_field :gender, :value => @profile.gender, :placeholder => t(".fill_me_out")
+      = profile.text_field :gender, :value => @profile.gender, :placeholder => t("fill_me_out")
 
     %h4
       Your birthday
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 6c8e46984..c6ec8a830 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -22,6 +22,7 @@ en:
   password: "Password"
   password_confirmation: "Password confirmation"
   are_you_sure: "Are you sure?"
+  fill_me_out: "Fill me out"
   
   activemodel:
       errors:
@@ -140,8 +141,6 @@ en:
       destroy: "Account successfully closed."
       getting_started:
           signup_steps: "Complete your sign-up by doing these things:"
-          step_1:
-              fill_me_out: "Fill me out"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
           connect_services: "Connect your services"
@@ -234,7 +233,6 @@ en:
           your_gender: "Your gender"
           your_birthday: "Your birthday"
           your_bio: "Your bio"
-          fill_me_out: "Fill me out"
           your_photo: "Your photo"
           update_profile: "Update Profile"
           search: "Search"

From 381c53b77523bcc2967561d2d8022548afe987ab Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 5 Nov 2010 23:06:38 +0100
Subject: [PATCH 03/15] found some untranslatable strings

---
 app/views/shared/_author_info.html.haml        |  6 +++---
 app/views/status_messages/_status_message.haml |  1 +
 config/locales/diaspora/en.yml                 | 10 ++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml
index 10a418741..a86807c22 100644
--- a/app/views/shared/_author_info.html.haml
+++ b/app/views/shared/_author_info.html.haml
@@ -8,12 +8,12 @@
           ➔
           %ul
             - if post.public?
-              the world
+              =t('the_world')
             - else
               - for aspect in current_user.aspects_with_post( post.id )
                 %li= link_to aspect.name, aspect
     #person_nav_links
       = link_to t('.view_profile'), person_path(person)
       = link_to t('_photos'), person_photos_path(person)
-      = link_to 'status messages', person_status_messages_path(person)
-      = "viewing: #{@post_type.to_s.titleize}" if defined?(@post_type)
+      = link_to t('.status messages'), person_status_messages_path(person)
+      = "#{t('.viewing')}: #{@post_type.to_s.titleize}" if defined?(@post_type)
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index 85fd62688..0b2f75347 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -3,3 +3,4 @@
 -#   the COPYRIGHT file.
 
 = markdownify(post.message)
+
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index c6ec8a830..b8d6fcc0b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -81,6 +81,8 @@ en:
           reshare: "Reshare"
       author_info:
           view_profile: "View profile"
+          status_messages: "status messages"
+          viewing: "viewing"
       add_friend_dropdown:
           add_to: "add to %{aspect}"
       public_explain:
@@ -204,10 +206,15 @@ en:
       new_status_message:
           tell_me_something_good: "tell me something good"
           oh_yeah: "oh yeah!"
+      status_message:
+          show_comments: "show comments"
+          the_world: "the world"
       show:
           destroy: "Destroy"
       helper:
           no_message_to_display: "No message to display."
+      index:
+          status_messages: "status messages"
   people:
       person:
           add_friend: "add friend"
@@ -224,6 +231,9 @@ en:
           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}."
           does_not_exist: "Person does not exist!"
+          bio_epic: "bio-epic"
+          gender: "gender"
+          born: "born"
       edit:
           info_available_to: "This info will be available to whomever you connect with on Diaspora."
           your_profile: "Your profile"

From d91c26fb6897145a099afcf3a19e08342d23b5b9 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Fri, 5 Nov 2010 23:51:37 +0100
Subject: [PATCH 04/15] translated getting started, fixed #508

---
 app/views/layouts/application.html.haml       |  2 +-
 app/views/people/edit.html.haml               |  4 +-
 app/views/photos/_photo.haml                  |  1 +
 .../status_messages/_status_message.haml      |  1 -
 app/views/users/getting_started.html.haml     |  6 +--
 .../users/getting_started/_step_1.html.haml   | 28 +++++------
 .../users/getting_started/_step_2.html.haml   | 12 ++---
 .../users/getting_started/_step_3.html.haml   | 14 +++---
 .../users/getting_started/_step_4.html.haml   | 24 ++++-----
 config/locales/diaspora/en.yml                | 50 +++++++++++++++++--
 10 files changed, 93 insertions(+), 49 deletions(-)

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]

From 8085a7bcd7ce5c872f578bd551e61f78f900e320 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 6 Nov 2010 14:04:18 +0100
Subject: [PATCH 05/15] fixes to be in sync with latest commits

---
 app/views/photos/_photo.haml                 | 2 +-
 app/views/shared/_notification.haml          | 2 +-
 app/views/shared/_stream_element.html.haml   | 2 +-
 app/views/shared/_stream_element.mobile.haml | 2 +-
 config/locales/diaspora/en.yml               | 7 ++++---
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index b5079fba0..385d85314 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -7,5 +7,5 @@
 %p.photo_description
   = post.caption
 
-= link_to "view all of #{post.person.real_name}'s photos", person_photos_path(post.person), :class => "small_text"
+= link_to t('.view_all', :name => post.person.real_name), person_photos_path(post.person), :class => "small_text"
 
diff --git a/app/views/shared/_notification.haml b/app/views/shared/_notification.haml
index 89bc610fb..153f78c2d 100644
--- a/app/views/shared/_notification.haml
+++ b/app/views/shared/_notification.haml
@@ -2,4 +2,4 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= link_to "New #{object.class.to_s} from #{object.person.real_name}", object_path(object.post)
+= link_to t('.new', :type => object.class.to_s, :from => object.person.real_name), object_path(object.post)
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index ed0dd2575..1f53a1047 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -13,7 +13,7 @@
         ➔
         %ul
           - if post.public?
-            %li= t('.the_world')
+            %li= t('the_world')
           - else
             - for aspect in current_user.aspects_with_post( post.id )
               %li= link_to aspect.name, aspect
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index e211e2edb..617861a7e 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -11,7 +11,7 @@
       .aspect
         ➔
         - if post.public?
-          = t('.the_world')
+          = t('the_world')
         - else
           = current_user.aspects_with_post( post.id ).join(', ')
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 2dad3e965..d2b7ad52c 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -58,7 +58,6 @@ en:
   shared:
       stream_element:
           show_comments: "show comments"
-          the_world: "the world"
       aspect_nav:
           manage: "Manage"
           manage_your_aspects: "Manage your Aspects"
@@ -92,6 +91,8 @@ en:
           outside: "Public messages will be available for others outside of Diaspora to see."
           logged_in: "logged in to %{service}"
           manage: "manage connected services"
+      notification:
+          new: "New %{type} from %{from}"
   aspects:
       no_friends_message:
           nobody: "We know you have friends — bring them to Diaspora!"
@@ -212,6 +213,8 @@ en:
           update_photo: "Update Photo"
       edit:
           editing: "Editing"
+      photo:
+          view_all: "view all of %{name}'s photos"
       new:
           new_photo: "New Photo"
           back_to_list: "Back to List"
@@ -250,8 +253,6 @@ en:
       new_status_message:
           tell_me_something_good: "tell me something good"
           oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "show comments"
       show:
           destroy: "Destroy"
       helper:

From 6400dc244f9967d752f947ca9536751932e08fae Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 6 Nov 2010 19:47:33 +0100
Subject: [PATCH 06/15] fixing again. it's getting anoying

---
 app/helpers/people_helper.rb                | 4 ++--
 app/views/people/_profile_sidebar.html.haml | 8 ++++----
 config/locales/diaspora/en.yml              | 7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index a764add8e..f9a84da22 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -14,9 +14,9 @@ module PeopleHelper
 
   def action_link(person, is_contact)
     if is_contact
-      link_to t('.remove_friend'), person, :confirm => t('are_you_sure'), :method => :delete
+      link_to t('people.profile_sidebar.remove_friend'), person, :confirm => t('are_you_sure'), :method => :delete
     elsif person == current_user.person
-      link_to t('.edit_my_profile'), edit_person_path(person)
+      link_to t('people.profile_sidebar.edit_my_profile'), edit_person_path(person)
     end
   end
 
diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml
index 13ff35288..178b22251 100644
--- a/app/views/people/_profile_sidebar.html.haml
+++ b/app/views/people/_profile_sidebar.html.haml
@@ -24,16 +24,16 @@
   -if is_contact || person == current_user.person
     %ul#profile_information
       %li  
-        %b bio
+        %b #{t('.bio')}
         %br
         = person.profile.bio
       %li
-        %b gender
+        %b #{t('.gender')}
         %br
         = person.profile.gender
       %li
-        %b born
+        %b #{t('.born')}
         %br
-        = "#{time_ago_in_words(person.profile.birthday)} ago" if @person.profile.birthday
+        = "#{time_ago_in_words(person.profile.birthday)} #{t('ago')}" if @person.profile.birthday
 
   %b.small= person.diaspora_handle
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index d2b7ad52c..45f9882e9 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -268,16 +268,12 @@ en:
       index:
           results_for: "search results for"
       show:
-          save: "save"
           no_posts: "no posts to display!"
           add_friend: "add friend"
           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}."
           does_not_exist: "Person does not exist!"
-          bio_epic: "bio-epic"
-          gender: "gender"
-          born: "born"
       edit:
           info_available_to: "This info will be available to whomever you connect with on Diaspora."
           your_profile: "Your profile"
@@ -300,6 +296,9 @@ en:
           edit_my_profile: "Edit my profile"
           last_seen: "last seen: %{how_long_ago}"
           friends_since: "friends since: %{how_long_ago}"
+          bio: "bio"
+          gender: "gender"
+          born: "born"
       helper:
            results_for: " results for %{params}"
            people_on_pod_are_aware_of: " people on pod are aware of"

From a957ba3aeda49dcf35c9d52b968b127de92148ca Mon Sep 17 00:00:00 2001
From: Jonne Hass <pr0fkill@gmail.com>
Date: Sun, 7 Nov 2010 10:20:17 +0100
Subject: [PATCH 07/15] so then I remove the newly unused friends_since for you

---
 config/locales/diaspora/en.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 45f9882e9..e5055b365 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -295,7 +295,6 @@ en:
           remove_friend: "remove friend"
           edit_my_profile: "Edit my profile"
           last_seen: "last seen: %{how_long_ago}"
-          friends_since: "friends since: %{how_long_ago}"
           bio: "bio"
           gender: "gender"
           born: "born"

From 748efb1860fb4cdcc47450a47b4c9b89e9a75f95 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 7 Nov 2010 14:44:56 +0100
Subject: [PATCH 08/15] eliminated senseless duplicates in en.yml

---
 .../users/getting_started/_step_1.html.haml   | 20 ++++++++---------
 .../users/getting_started/_step_2.html.haml   |  4 ++--
 .../users/getting_started/_step_3.html.haml   | 10 ++++-----
 config/locales/diaspora/en.yml                | 22 +------------------
 4 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/app/views/users/getting_started/_step_1.html.haml b/app/views/users/getting_started/_step_1.html.haml
index 1ebfddd2d..038d9a724 100644
--- a/app/views/users/getting_started/_step_1.html.haml
+++ b/app/views/users/getting_started/_step_1.html.haml
@@ -7,42 +7,42 @@
   %h3
     = t('.your_profile')
     .description
-      = t('.info')
+      = t('people.edit.info_available_to')
 
   = person.error_messages
 
   = person.fields_for :profile do |profile|
     %h4
-      = 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')
+      = t('people.edit.your_name')
+      = profile.text_field :first_name, :value => @profile.first_name, :placeholder => t('people.edit.first_name')
+      = profile.text_field :last_name, :value => @profile.last_name, :placeholder => t('people.edit.last_name')
 
     %h4
-      = t('.your_gender')
+      = t('people.edit.your_gender')
       %br
       = profile.text_field :gender, :value => @profile.gender, :placeholder => t("fill_me_out")
 
     %h4
-      = t('.your_birthday')
+      = t('people.edit.your_birthday')
       %br
       = select_date @person.profile.birthday, :prompt => true, :default => true, :order => t('date.order'), :start_year => 2000, :end_year => 1930
 
     %h4
-      = t('.your_bio')
+      = t('people.edit.your_bio')
       = profile.text_area :bio, :value => @profile.bio, :rows => 5, :placeholder => t('fill_me_out')
 
     %h4
-      = t('.your_photo')
+      = t('people.edit.your_photo')
       = render 'people/profile_photo_upload', :form => profile
 
     %h4
       = t('search')
       %p{:class=>"checkbox_select"}
-        = profile.label :searchable, t('.allow_searchable')
+        = profile.label :searchable, t('people.edit.allow_search')
         = profile.check_box :searchable, {:checked => @person.profile.searchable}, true, false
 
     = hidden_field_tag :getting_started, @step
 
   .submit_block
-    = person.submit "#{t('.save_and_continue')} →"
+    = person.submit "#{t('users.getting_started.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 2b4f8b841..63028ffc7 100644
--- a/app/views/users/getting_started/_step_2.html.haml
+++ b/app/views/users/getting_started/_step_2.html.haml
@@ -22,7 +22,7 @@
         - for friend in aspect.person_objects
           = person_image_link(friend)
 
-        = link_to (image_tag('add_friend_button.png', :title => t('.add_to', :aspect => aspect))), '#manage_aspect_contacts_pane', :class => 'manage_aspect_contacts_button'
+        = link_to (image_tag('add_friend_button.png', :title => t('shared.aspect_friends.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 "#{t('.save_and_continue')} →", getting_started_path(:step => 3), :class => "button"
+  = link_to "#{t('users.getting_started.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 25440cd12..222288b14 100644
--- a/app/views/users/getting_started/_step_3.html.haml
+++ b/app/views/users/getting_started/_step_3.html.haml
@@ -11,13 +11,13 @@
   - for service in @services
     %h3
       %b= service.provider
-      = t('.logged_in_as')
+      = t('services.index.logged_in_as')
       %b= service.nickname
-      = link_to t('.disconnect'), service, :confirm => t('.disconnect_from', :service => service.provider), :method => :delete
+      = link_to t('services.index.disconnect'), service, :confirm => t('services.index.really_disconnect', :service => service.provider), :method => :delete
 
-%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'] !=""
+%h4= link_to t('services.index.connect_to_twitter'), "/auth/twitter" if SERVICES['twitter']['consumer_key']!= ""
+%h4= link_to t('services.index.connect_to_facebook'), "/auth/facebook" if SERVICES['facebook']['app_id'] !=""
 
 .submit_block
-  = link_to "#{t('.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"
+  = link_to "#{t('users.getting_started.save_and_continue')} →", getting_started_path(:step => 4), :class => "button"
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index e5055b365..ff98f6720 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -84,8 +84,6 @@ en:
           view_profile: "View profile"
           status_messages: "status messages"
           viewing: "viewing"
-      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."
@@ -151,34 +149,17 @@ en:
           define_aspects: "Define your aspects"
           connect_services: "Connect your services"
           skip: "skip getting started"
+          save_and_continue: "Save and continue"
           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 "
@@ -261,7 +242,6 @@ en:
           status_messages: "status messages"
   people:
       person:
-          add_friend: "add friend"
           pending_request: "pending request"
           already_friends: "Already friends"
           thats_you: "thats you!"

From a4f5a1e7ae89df8d53fdadd62ce950a857da4da3 Mon Sep 17 00:00:00 2001
From: Hexagon <robinnilsson@gmail.com>
Date: Sun, 7 Nov 2010 16:17:25 +0100
Subject: [PATCH 09/15] Updated swedish translation

---
 config/locales/diaspora/sv.yml | 267 +++++++++++++++++----------------
 1 file changed, 139 insertions(+), 128 deletions(-)

diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 587bc4350..90266dff5 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -22,6 +22,27 @@
 #   seed:            frö
 #
 sv:
+
+  settings: "Inställningar"
+  profile: "Profil"
+  account: "Konto"
+  _services: "Tjänster"
+  _photos: "foton"
+  ok: "OK"
+  cancel: "Avbryt"
+  delete: "Ta bort"  
+  or: "eller"
+  ago: "sedan"
+  username: "Användarnamn"
+  email: "E-post"
+  password: "Lösenord"
+  password_confirmation: "Bekräfta lösenord"
+  are_you_sure: "Är du säker?"
+  fill_me_out: "Fyll i mig"
+  back: "Tillbaka"
+  the_world: "världen"
+  search: "Sök"
+
   activemodel:
       errors:
           models:
@@ -37,74 +58,54 @@ sv:
                   attributes:
                       diaspora_handle:
                           taken: "är redan taget"
-  hello: "Hej världen!"
   application:
       helper:
           unknown_person: "okänd person"
-          new_requests: "nya förfrågningar"
-  dashboards:
-      helper:
-          home: "hem"
   error_messages:
       helper:
           invalid_fields: "Ogiltiga uppgifter"
           correct_the_following_errors_and_try_again: "Rätta följande fel och försök igen."
-  people:
-      helper:
-           results_for: " resultat för %{params}"
-           people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
   layouts:
       application:
           view_profile: "visa profil"
           edit_profile: "ändra profil"
           account_settings: "kontoinstallningar"
-          search: "Sök ..."
           logout: "logga ut"
   shared:
+      stream_element:
+          show_comments: "show comments"
       aspect_nav:
-          all_aspects: "Alla sidor"
           manage: "Hantera"
           manage_your_aspects: "Hantera dina sidor"
-      sub_header:
-          all_aspects: "Alla sidor"
-          manage_aspects: "Hantera sidor"
+          everyone: "Alla"
+          add_a_new_aspect: "lägg till en ny sida"
       publisher:
           share: "Dela"
+          post_a_message_to: "Skicka ett meddelande till %{aspect}"
+          make_public: "gör publik"
+          share_with_all: "Dela på alla sidor"
+          share_with: "Dela med %{aspect}"
+          all: "alla"
       aspect_friends:
           add_friends: "lägg till vänner"
-          photos: "foton"
-  albums:
-      album:
-          you: "du"
-      new_album:
-          create: "skapa"
-          add_a_new_album: "Lägg till ett nytt fotoalbum"
-      show:
-          edit_album: "Ändra fotoalbum"
-          albums: "fotoalbum"
-          updated: "uppdaterad"
-          by: "av"
-      edit:
-          album_name: "Namn på fotoalbum"
-          editing: "Ändrar"
-          updated: "uppdaterad"
-          update_album: "Uppdatera fotoalbum"
-          are_you_sure: "Är du säker?"
-          delete_album: "Ta bort fotoalbum"
-          cancel: "Avbryt"
-      index:
-          home: "hem"
-          new_album: "Nytt fotoalbum"
-      create:
-          success: "Du har nu skapat fotoalbumet %{name}."
-      update:
-          success: "Fotoalbumet %{name} ändrades."
-          failure: "Ändringarna av fotoalbumet %{name} misslyckades."
-      destroy:
-          success: "Fotoalbumet %{name} är nu borttaget."
-      helper:
-          friends_albums: "Vänners fotoalbum"
-          your_albums: "Dina fotoalbum"
+          everyone: "Alla"
+          add_to: "lägg till i %{aspect}"
+      invitations:
+          invites: "Inbjudningar"
+          invite_a_friend: "Bjud in en vän"
+          invitations_left: "(%{count} kvar)"
+      reshare:
+          reshare: "Återdela"
+      author_info:
+          view_profile: "Visa profil"
+          status_messages: "statusmeddelande"
+      public_explain:
+          title: "Du är på väg att skicka ett publikt meddelande!"
+          outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
+          logged_in: "inloggad på %{service}"
+          manage: "hantera anslutna tjänster"
+      notification:
+          new: "Ny %{type} från %{from}"
   aspects:
       no_friends_message:
           nobody: "Vi vet att du har vänner, bjud in dem till Diaspora!"
@@ -135,58 +136,74 @@ sv:
       move_friend:
           failure: "fungerade inte %{inspect}"
           success: "Personen flyttades till den nya sidan"
+          error: "Kunde inte flytta vän: %{inspect}"
       add_to_aspect:
           failure: "Misslyckades med att lägga in personen på den nya sidan."
           success: "Personen tillagt på sidan."
       helper:
           remove: "ta bort"
           aspect_not_empty: "Sidan är inte tom"
+      remove_from_aspect:
+          success: "Personen är nu borttagen från vald sida"
+          failure: "Misslyckades med att ta bort personen från vald sida"
   users:
       edit:
-          editing_profile: "Ändrar profil"
           invite_friends: "Bjud in en vän"
-          are_you_sure: "Är du säker?"
           export_data: "Exportera data"
           close_account: "Stäng kontot"
           change_language: "Ändra språk"
           change_password: "Ändra lösenord"
           new_password: "Nytt lösenord"
-          password_confirmation: "Bekräfta lösenord"
-          settings: "Inställningar"
-          profile: "Profil"
-          account: "Konto"
-          services: "Tjänster"
-          cancel: "Avbryt"
+          download_xml: "Ladda ner min xml"
+          download_photos: "Ladda ner mina foton"
       destroy: "Ditt konto är nu stängt."
       getting_started:
-          'step_1':
-              albums: "Fotoalbum"
-              you_dont_have_any_photos: "Du har inga foton!  Gå till"
-              page_to_upload_some:  "sidan för att ladda upp några."
-              or: "eller"
+          welcome: "Välkommen till diaspora!"
+          signup_steps: "Slutför registreringen genom att följa den här guiden:"
+          edit_profile: "Ändra din profil"
+          define_aspects: "Välj dina sidor"
+          connect_services: "Anslut andra tjänster"
+          skip: "hoppa över guiden"
+          save_and_continue: "Spara och fortsätt"
+          step_1:
+              your_profile: "Din Profil"
+          step_2:
+              your_aspects: "Dina sidor"
+              description: "Här anger du vilka sidor av dig själv du vill visa på Diaspora, dessa sidor är bara något du själv ser. Genom dessa kan du välja vilka personer som ska se vad du skickar."
+              aspect_name: "Namn på sida"
+              add: "Lägg till"
+          step_3:
+              your_services: "Dina tjänster"
+              description: 'Anslut dina befintliga tjänster till ditt Diaspora-konto.  Du kommer att kunna skicka meddelanden genom dessa om du väljer "gör publik." på sidan för alla vänner.'
+          step_4:
+              set_up: "Nu är guiden klar, %{name}!"
+              ready_to_share: "Du är nu redo att börja dela med "
+              continue: 'Fortsätt till "Alla" sidan, en överblick av alla dina sidor.'
+              change_profile: "Du kan ändra din profil närsomhelst genom att klicka på"
+              edit_profile: "ändra profil"
+              user_menu: "i användarmenyn uppe till vänster."
+              connect_disconnect: "Du kan ansluta och koppla bort dina andra tjänster när som helst genom att klicka på"
+              edit_account: "kontoinställningar"
+              manage_aspects: "Du kan hantera dina olika sidor närsomhelst genom att klicka på"
+              manage: "hantera"
+              tab_also_added: "-fliken.  Du kan även lägga till en ny kontakt direkt på en sida."
   comments:
-      comment:
-          ago: "sedan"
       new_comment:
           comment: "Kommentar"
   photos:
       show:
+          delete_photo: "Ta bort foto"
           prev: "föregående"
           full_size: "full storlek"
           next: "nästa"
           edit_photo: "Ändra foto"
-          delete_photo: "Ta bort foto"
-          are_you_sure: "Är du säker?"
-          comments: "kommentarer"
+          add_a_description: "Lägg till beskrivning"
+          make_profile_photo: "använd som profilbild"
+          update_photo: "Uppdatera foto"
       edit:
           editing: "Ändrar"
-          are_you_sure: "Är du säker?"
-          delete_photo: "Ta bort foto"
       photo:
-          show_comments: "visa kommentarer"
-          posted_a_new_photo_to: "laddade upp ett nytt foto till"
-          delete: "Ta bort"
-          are_you_sure: "Är du säker?"
+          view_all: "visa alla foton %{name} laddat upp"
       new:
           new_photo: "Nytt foto"
           back_to_list: "Tillbaka till listan"
@@ -204,12 +221,6 @@ sv:
       new:
           sign_up: "Registrera dig"
           sign_up_for_diaspora: "Gå med i Diaspora"
-          upload_existing_account: "Ladda upp ett befintligt Diaspora-konto"
-          upload: "Ladda upp"
-          username: "Användarnamn"
-          email: "E-post address"
-          password: "Lösenord"
-          password_confirmation: "Bekräfta lösenord"
       create:
           success: "Du har nu gått med i Diaspora!"
   invitations:
@@ -218,51 +229,41 @@ sv:
           no_more: 'Du har inga fler inbjudningar.'
           already_sent: 'Du har redan bjudit in denna person.'
           already_friends: 'Du är redan vän med den här personen'
-          invitation_token_invalid: 'Din inbjudningskod är inte giltig!'
-          updated: 'Ditt lösenord är nu uppdaterat, och du har loggats in.'
-
+      new:
+          invite_someone_to_join: "Bjud in en än till Diaspora!"
+          if_they_accept_info: "om de accepterar så kommer de att läggas till på den sida du valde"
+          to: "Till"
+          message: "Meddelande:"
+          send_an_invitation: "Skicka en inbjudan"
+          send_invitation: "Skicka inbjudan"
+      check_token:
+          not_found: "Inbjudan inte funnen"
   status_messages:
       new_status_message:
           tell_me_something_good: "berätta något intressant"
           oh_yeah: "oh yeah!"
-      status_message:
-          show_comments: "visa kommentarer"
-          delete: "Ta bort"
-          are_you_sure: "Är du säker?"
       show:
-          status_message: "Statusmeddelande"
-          comments: "kommentarer"
-          are_you_sure: "Är du säker?"
           destroy: "Ta bort"
-          view_all: "Visa alla"
-          message: "Meddelande"
-          owner: "Ägare"
       helper:
           no_message_to_display: "Inget meddelande att visa."
+      index:
+          status_messages: "statusmeddelanden"
   people:
       person:
-          add_friend: "lägg till vän"
-          pending_request: "väntande vänförfrågan"
+          pending_request: "väntande förfrågningar"
+          already_friends: "Redan vänner"
+          thats_you: "Detta är du!"
       index:
-          add_friend: "lägg till vän"
-          real_name: "verkligt namn"
-          diaspora_handle: "diaspora-adress"
-          thats_you: "det är du!"
-          friend_request_pending: "vänförfrågan är skickad"
-          you_have_a_friend_request_from_this_person: "du har en väntande vänförfrågan från den här personen"
-      new:
-          new_person: "Ny person"
-          back_to_list: "Tillbaka till listan"
+          results_for: "sökresultat för"
       show:
-          last_seen: "senast sedd: %{how_long_ago}"
-          friends_since: "vänner sedan: %{how_long_ago}"
-          save: "spara"
-          are_you_sure: "Är du säker?"
-          remove_friend: "ta bort vän"
-          no_posts: "ingenting att visa!"
-          add_friend: "lägg till en vän"
+          no_posts: "inga meddelanden att visa!"
+          add_friend: "lägg till vän"
+          not_friends: "Du ärr närvarande inte vän med %{name}"
+          request_people: "Om du känner för det så skulle du kunna skicka en vänförfrågan."
+          already_requested: "Du har redan skickat en vänförfrågan till %{name}."
+          does_not_exist: "Den här personen finns inte!"
       edit:
-          settings: "Inställningar"
+          info_available_to: "Den här informationen kommer vara synlig för alla som du ansluter till på diaspora."
           your_profile: "Din profil"
           your_name: "Ditt namn"
           first_name: "Förnamn"
@@ -270,22 +271,24 @@ sv:
           your_gender: "Ditt kön"
           your_birthday: "Din födelsedag"
           your_bio: "Din biografi"
-          fill_me_out: "Fyll i mig"
-          your_photo: "Ditt foto"
-          profile: "Profil"
-          account: "Konto"
-          services: "Tjänster"
-          cancel: "Avbryt"
+          your_photo: "Your photo"
           update_profile: "Uppdatera profil"
-          home: "Hem"
-          diaspora_username: "Användarnamn:"
-          info: "Info"
-          picture: "Foto"
-          editing_profile: "Ändrar profil"
-          albums: "Fotoalbum"
-          you_dont_have_any_photos: "Du har inga foton!  Gå till"
-          page_to_upload_some:  "sidan för att ladda upp några."
-          or: "eller"
+          allow_search: "Tillåt andra att söka efter dig"
+      profile_photo_upload:
+          or_select_one: "eller välj en befintlig bild"
+      update:
+          updated: "Profilen är uppdaterad"
+          failed: "Misslyckades med att uppdatera profilen"
+      profile_sidebar:
+          remove_friend: "ta bort vän"
+          edit_my_profile: "Ändra min profil"
+          last_seen: "senast sedd: %{how_long_ago}"
+          bio: "bio"
+          gender: "kön"
+          born: "född"
+      helper:
+           results_for: " resultat för %{params}"
+           people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
   requests:
       new_request:
           add_a_new_friend_to: "Lägg till en vän till"
@@ -307,10 +310,18 @@ sv:
           horribly_wrong: "Nu gick något rejält fel här."
   services:
       index:
-          settings: "Inställningar"
-          profile: "Profil"
-          account: "Konto"
-          services: "Tjänster"
+        logged_in_as: "inloggad som"
+        disconnect: "koppla från"
+        really_disconnect: "koppla från %{service}?"
+        connect_to_twitter: "Anslut till twitter"
+        connect_to_facebook: "Anslut till facebook"
+      create:
+          success: "Autentiering lyckades."
+      destroy:
+          success: "Du har nu kopplat bort tjänsten."
+  dashboards:
+      helper:
+          home: "Hem"
 
 # The following is from the rails-i18n project at http://github.com/svenfuchs/rails-i18n
 

From 9ceb3e2fd19b9ebceaa39ab5756c6186e24c1c23 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 7 Nov 2010 22:12:50 +0100
Subject: [PATCH 10/15] found some still untranslatable strings in helpers and
 stuff

---
 app/helpers/application_helper.rb | 2 +-
 app/helpers/aspects_helper.rb     | 2 +-
 app/mailers/notifier.rb           | 4 ++--
 config/locales/diaspora/en.yml    | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 08e4856fe..cade35c04 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -164,7 +164,7 @@ module ApplicationHelper
       return @@youtube_title_cache[id]
     end
 
-    ret = 'Unknown Video Title' #TODO add translation
+    ret = I18n.t 'application.helper.youtube_title.unknown'
     http = Net::HTTP.new('gdata.youtube.com', 80)
     path = '/feeds/api/videos/'+id+'?v=2'
     resp, data = http.get(path, nil)
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index d627b3e69..233b310f1 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -9,7 +9,7 @@ module AspectsHelper
 
   def remove_link( aspect )
     if aspect.people.size == 0
-      link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => "Are you sure you want to delete this aspect?"
+      link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => I18n.t('aspects.helper.are_you_sure')
     else
       "<span class='grey' title=#{I18n.t('aspects.helper.aspect_not_empty')}>#{I18n.t('aspects.helper.remove')}</span>"
     end
diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index e95b34b15..c624470d2 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -11,7 +11,7 @@ class Notifier < ActionMailer::Base
     attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT 
   
     mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
-         :subject => "new Diaspora* friend request from #{@sender.real_name}", :host => APP_CONFIG[:terse_pod_url])
+         :subject => I18n.t('notifier.new_request.subject', :from => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
   end
 
   def request_accepted(recipient_id, sender_id, aspect_id)
@@ -21,6 +21,6 @@ class Notifier < ActionMailer::Base
     attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT 
 
     mail(:to => "#{@receiver.real_name} <#{@receiver.email}>",
-          :subject => "#{@sender.real_name} has accepted your friend request on Diaspora*", :host => APP_CONFIG[:terse_pod_url])
+          :subject => I18n.t('notifier.request_accepted.subject', :name => @sender.real_name), :host => APP_CONFIG[:terse_pod_url])
   end
 end
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index ff98f6720..a8cf0acbd 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -45,6 +45,8 @@ en:
   application:
       helper:
           unknown_person: "unknown person"
+          youtube_title:
+              unknown: "Unknown Video Title"
   error_messages:
       helper:
           invalid_fields: "Invalid Fields"
@@ -128,6 +130,7 @@ en:
       helper:
           remove: "remove"
           aspect_not_empty: "Aspect not empty"
+          are_you_sure: "Are you sure you want to delete this aspect?"
       remove_from_aspect:
           success: "Successfully removed person from aspect"
           failure: "Failed to remove person from aspect"
@@ -308,5 +311,10 @@ en:
   dashboards:
       helper:
           home: "Home"
+  notifier:
+      new_request:
+          subject: "new Diaspora* friend request from %{from}"
+      request_accepted:
+          subject: "%{name} has accepted your friend request on Diaspora*"
   date:
       order: [:month, :day, :year]

From 0a363a73b040d26cc6a8774e5f66856260f1baca Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sun, 7 Nov 2010 22:46:06 +0100
Subject: [PATCH 11/15] just found the mailer... :)

---
 .../mailer/confirmation_instructions.html.haml |  6 +++---
 app/views/devise/mailer/invitation.html.haml   | 14 +++++++-------
 .../reset_password_instructions.html.haml      | 10 +++++-----
 .../mailer/unlock_instructions.html.haml       |  8 ++++----
 app/views/notifier/new_request.html.haml       | 12 ++++++------
 app/views/notifier/new_request.text.haml       | 12 ++++++------
 app/views/notifier/request_accepted.html.haml  | 10 +++++-----
 app/views/notifier/request_accepted.text.haml  | 10 +++++-----
 config/locales/devise/devise.en.yml            | 18 ++++++++++++++++++
 config/locales/diaspora/en.yml                 |  8 ++++++++
 10 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
index 0dd9d28c0..4856f9471 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.haml
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -46,6 +46,6 @@
       = image_tag '/images/diaspora_white.png'
     #container
       %p
-        Welcome #{@resource.email}!
-      %p You can confirm your account through the link below:
-      %p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token), :class => "large_text"
+        = t('devise.mailer.welcome', :email => @resource.email)
+      %p = t('.you_can_confirm')
+      %p= link_to t('.confirm'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token), :class => "large_text"
diff --git a/app/views/devise/mailer/invitation.html.haml b/app/views/devise/mailer/invitation.html.haml
index 4dd82e773..ef582749e 100644
--- a/app/views/devise/mailer/invitation.html.haml
+++ b/app/views/devise/mailer/invitation.html.haml
@@ -47,20 +47,20 @@
     #container
       - @invs = @resource.invitations_to_me
       %p
-        Hello #{@resource.email}!
+        = t('devise.mailer.welcome', :email => @resource.email)
       %p
         - if @invs.count == 1
-          = @invs.first.real_name + " (#{@invs.first.diaspora_handle})" + " has" 
+          = t('.has_invited_you', :name => @invs.first.real_name + " (#{@invs.first.diaspora_handle})")
         - else
-          = (@invs.map{|inv| inv.from.real_name + " (#{inv.from.diaspora_handle})"}.join(",") + " have")
-        = "invited you to join Diaspora at #{root_url}, you can accept it through the link below."
+          = t('.have_invited_you', :names => (@invs.map{|inv| inv.from.real_name + " (#{inv.from.diaspora_handle})"}.join(",")))
+        = t('.accept_at', :url => root_url)
       - @invs.each do |inv|
         - if inv.message
           = "#{inv.from.real_name}:"
           = "\"#{inv.message}\""
           %p
-      %p= link_to 'Accept invitation', accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text"
+      %p= link_to t('.accept'), accept_invitation_url(@resource, :invitation_token => @resource.invitation_token), :class => "large_text"
       %p.small
-        If you don't want to accept the invitation, please ignore this email.
+        = t('.ignore')
         %br/
-        Your account won't be created until you access the link above and sign up.
+        = t('.no_account_till')
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
index 4b344d44e..517333444 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.haml
+++ b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -46,8 +46,8 @@
       = image_tag '/images/diaspora_white.png'
     #container
       %p
-        Hello #{@resource.email}!
-      %p Someone has requested a link to change your password, and you can do this through the link below.
-      %p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token), :class => "large_text"
-      %p Your password won't change until you access the link above and create a new one.
-      %p.small If you didn't request this, please ignore this email.
+        = t('devise.mailer.hello', :email => @resource.email)
+      %p = t('.someone_requested')
+      %p= link_to t('.change'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token), :class => "large_text"
+      %p = t('.wont_change')
+      %p.small = t('.ignore')
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
index 6fff6bfce..d6359afea 100644
--- a/app/views/devise/mailer/unlock_instructions.html.haml
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -46,7 +46,7 @@
       = image_tag '/images/diaspora_white.png'
     #container
       %p
-        Hello #{@resource.email}!
-      %p Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
-      %p Click the link below to unlock your account:
-      %p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token), :class => "large_text"
+        = t('devise.mailer.hello', :email => @resource.email)
+      %p = t('.account_locked')
+      %p = t('.click_to_unlock')
+      %p= link_to t('.unlock'), unlock_url(@resource, :unlock_token => @resource.unlock_token), :class => "large_text"
diff --git a/app/views/notifier/new_request.html.haml b/app/views/notifier/new_request.html.haml
index 1a994695a..bf964dbda 100644
--- a/app/views/notifier/new_request.html.haml
+++ b/app/views/notifier/new_request.html.haml
@@ -46,14 +46,14 @@
       = image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
     #container
       %p
-        Hello #{@receiver.profile.first_name}!
+        = t('notifier.hello', => :name)
       %p
         = "#{@sender.real_name} (#{@sender.diaspora_handle})"
-        just sent you a friend request on Diaspora*
-        You should really think about checking it out.
+        = t('.just_sent_you')
+        = t('.try_it_out')
         %br
-        = link_to "sign in here", new_user_session_url
+        = link_to t('.sign_in'), new_user_session_url
         %br
-        love, 
+        = t('notifier.love'), 
         %br
-        the diaspora email robot
+        = t('notifier.diaspora')
diff --git a/app/views/notifier/new_request.text.haml b/app/views/notifier/new_request.text.haml
index 8ab5bc570..9d4f6e957 100644
--- a/app/views/notifier/new_request.text.haml
+++ b/app/views/notifier/new_request.text.haml
@@ -1,9 +1,9 @@
-= "hey #{@receiver.profile.first_name},"
+= t('notifier.hello', :name => @receiver.profile.first_name)
 = "#{@sender.real_name} (#{@sender.diaspora_handle})"
-just sent you a friend request on Diaspora*
-You should really think about checking it out.
+= t('notifier.new_request.just_sent_you')
+= t('notifier.new_request.try_it_out')
 
-= "sign in here: #{new_user_session_url}"
+= "#{t('notifier.new_request.sign_in')}: #{new_user_session_url}"
 
-love, 
-the diaspora email robot
+= t('notifier.love')
+= t('notifier.diaspora')
diff --git a/app/views/notifier/request_accepted.html.haml b/app/views/notifier/request_accepted.html.haml
index 15ca54647..9c4468916 100644
--- a/app/views/notifier/request_accepted.html.haml
+++ b/app/views/notifier/request_accepted.html.haml
@@ -46,14 +46,14 @@
       = image_tag attachments['diaspora_white_on_grey.png'].url, :alt => "DIASPORA"
     #container
       %p
-        Hello #{@receiver.profile.first_name}!
+        = t('notifier.hello', :name => @receiver.profile.first_name
       %p
         = "#{@sender.real_name} (#{@sender.diaspora_handle})"
-        has accepted your friend request. They are now in your 
+        = t('.accepted')
         = link_to @aspect.name, aspect_url(@aspect)
-        aspect.
+        = t('.aspect')
 
         %br
-        love, 
+        = t('notifier.love') 
         %br
-        the diaspora email robot
+        = t('notifier.diaspora')
diff --git a/app/views/notifier/request_accepted.text.haml b/app/views/notifier/request_accepted.text.haml
index e10623f16..334a68ddf 100644
--- a/app/views/notifier/request_accepted.text.haml
+++ b/app/views/notifier/request_accepted.text.haml
@@ -1,9 +1,9 @@
-= "hey #{@receiver.profile.first_name},"
+= t('notifier.hello', :name => @receiver.profile.first_name
 = "#{@sender.real_name} (#{@sender.diaspora_handle})"
-has accepted your friend request. They are now in your 
-= "#{@aspect.name} asepct.\n" 
+= t('notifier.request_accepted.accepted')
+= "#{@aspect.name} #{t('notifier.request_accepted.aspect')}\n" 
 = "#{aspect_url(@aspect)}"
 
 
-love, \n 
-the diaspora email robot
+= "#{t('notifier.love')} \n"
+= t('notifier.diaspora')
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index d47a44051..42d49223a 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -21,6 +21,7 @@ en:
         password: 'Password'
         sign_in: 'Sign in'
         have_a_problem: "Have a problem? Find an answer here"
+        remember_me: "Remember me"
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -44,14 +45,31 @@ en:
       invitation_token_invalid: 'The invitation token provided is not valid!'
       updated: 'Your password was set successfully. You are now signed in.'
     mailer:
+      welcome: "Welcome %{email}!"
+      hello: "Hello %{email}!"
       confirmation_instructions:
         subject: 'Confirmation instructions'
+        you_can_confirm: "You can confirm your account through the link below:"
+        confirm: "Confirm my account"
       reset_password_instructions:
         subject: 'Reset password instructions'
+        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
+        change: "Change my password"
+        wont_change: "Your password won't change until you access the link above and create a new one."
+        ignore: "If you didn't request this, please ignore this email."
       unlock_instructions:
         subject: 'Unlock Instructions'
+        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
+        click_to_unlock: "Click the link below to unlock your account:"
+        unlock: "Unlock my account"
       invitation:
         subject: 'A friend wants you to join Diaspora!'
+        has_invited_you: "%{name} has invited you to join Diaspora"
+        have_invited_you: "%{names} have invited you to join Diaspora"
+        accept_at: ", at %{url}, you can accept it through the link below."
+        accept: "Accept invitation"
+        ignore: "If you don't want to accept the invitation, please ignore this email."
+        no_account_till: "Your account won't be created until you access the link above and sign up."
     shared:
       links:
         sign_in: 'Sign in'
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a8cf0acbd..34d76aa3f 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -312,9 +312,17 @@ en:
       helper:
           home: "Home"
   notifier:
+      hello: "Hello %{name}!"
+      love: "love,"
+      diaspora: "the diaspora email robot"
       new_request:
           subject: "new Diaspora* friend request from %{from}"
+          just_sent_you: "just sent you a friend request on Diaspora*"
+          try_it_out: "You should really think about checking it out."
+          sign_in: "sign in here"
       request_accepted:
           subject: "%{name} has accepted your friend request on Diaspora*"
+          accepted: "has accepted your friend request. They are now in your"
+          aspect: "aspect."
   date:
       order: [:month, :day, :year]

From 52da9c84ed2719dfa0390474274f0289cae24a7f Mon Sep 17 00:00:00 2001
From: Hexagon <robinnilsson@gmail.com>
Date: Wed, 10 Nov 2010 17:08:34 +0100
Subject: [PATCH 12/15] Update of sv.yml to match latest additions

---
 config/locales/diaspora/sv.yml | 38 +++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 90266dff5..55a3114c1 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -61,6 +61,8 @@ sv:
   application:
       helper:
           unknown_person: "okänd person"
+          youtube_title:
+              unknown: "Okänd videotitel"
   error_messages:
       helper:
           invalid_fields: "Ogiltiga uppgifter"
@@ -99,6 +101,7 @@ sv:
       author_info:
           view_profile: "Visa profil"
           status_messages: "statusmeddelande"
+          viewing: "visar"
       public_explain:
           title: "Du är på väg att skicka ett publikt meddelande!"
           outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
@@ -118,10 +121,10 @@ sv:
       manage:
           add_a_new_aspect: "Lägg till en ny sida"
           add_a_new_friend:  "Lägg till en ny vän"
-          show: "Visa"
-          update_aspects: "Uppdatera sidor"
           requests: "Vänförfrågningar"
-          ignore_remove: "Ignorera/Ta bort"
+          no_requests: "Inga nya förfrågningar"
+          manage_aspects: "Hantera sidor"
+          drag_to_add: "Dra för att lägga till personer"
       new_aspect:
           add_a_new_aspect: "Lägg till ny sida"
           name: "Namn"
@@ -143,6 +146,7 @@ sv:
       helper:
           remove: "ta bort"
           aspect_not_empty: "Sidan är inte tom"
+          are_you_sure: "Är du säker på att du vill ta bort den här sidan?"
       remove_from_aspect:
           success: "Personen är nu borttagen från vald sida"
           failure: "Misslyckades med att ta bort personen från vald sida"
@@ -187,6 +191,13 @@ sv:
               manage_aspects: "Du kan hantera dina olika sidor närsomhelst genom att klicka på"
               manage: "hantera"
               tab_also_added: "-fliken.  Du kan även lägga till en ny kontakt direkt på en sida."
+      update:
+          password_changed: "Lösenordet är nu ändrat"
+          password_not_changed: "Lösenordet kunde inte ändras"
+          language_changed: "Språk är nu ändrat"
+          language_not_changed: "Språket kunde inte ändras"
+      public:
+          does_not_exist: "Användaren %{username} finns inte!"
   comments:
       new_comment:
           comment: "Kommentar"
@@ -301,13 +312,7 @@ sv:
           error: "Var god välj en aspekt!"
           ignore: "Ignorerade vänförfrågan."
       create:
-          error: "Inget diaspora-frö med denna adress hittades!"
-          invalid_identity: "Denna adress har ett ogiltigt format"
-          error_server: "Problem att kontaka den andra servern. Är det möjligt att den inte finns?"
-          yourself: "Du kan inte lägga till dig själv!"
-          already_friends: "Du är redan vän med %{destination_url}!"
-          success: "En vänförfrågan har skickats till %{destination_url}."
-          horribly_wrong: "Nu gick något rejält fel här."
+          tried: "vi gjorde vårat bästa för att skicka meddelandet till %{account}"
   services:
       index:
         logged_in_as: "inloggad som"
@@ -322,6 +327,19 @@ sv:
   dashboards:
       helper:
           home: "Hem"
+  notifier:
+      hello: "Hej %{name}!"
+      love: "hälsningar,"
+      diaspora: "Diasporas mailrobot"
+      new_request:
+          subject: "ny Diaspora vänförfågan från %{from}"
+          just_sent_you: "skickade nyss en vänförfrågan till dig på Diaspora"
+          try_it_out: "Du borde verkligen överväga att kolla upp detta."
+          sign_in: "logga in här"
+      request_accepted:
+          subject: "%{name} har accepterat din vänförfrågan på Diaspora"
+          accepted: "har accepterat din vänförfrågan. Denne finns nu på "
+          aspect: "sidan."
 
 # The following is from the rails-i18n project at http://github.com/svenfuchs/rails-i18n
 

From f55a973685de139dfba7a74449d5d2ed0f53d5ba Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 10 Nov 2010 20:56:00 +0100
Subject: [PATCH 13/15] two small fixes

---
 app/views/shared/_author_info.html.haml | 2 +-
 config/locales/diaspora/en.yml          | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml
index a86807c22..cafd24a43 100644
--- a/app/views/shared/_author_info.html.haml
+++ b/app/views/shared/_author_info.html.haml
@@ -15,5 +15,5 @@
     #person_nav_links
       = link_to t('.view_profile'), person_path(person)
       = link_to t('_photos'), person_photos_path(person)
-      = link_to t('.status messages'), person_status_messages_path(person)
+      = link_to t('.status_messages'), person_status_messages_path(person)
       = "#{t('.viewing')}: #{@post_type.to_s.titleize}" if defined?(@post_type)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 34d76aa3f..498ba6bd9 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -241,8 +241,6 @@ en:
           destroy: "Destroy"
       helper:
           no_message_to_display: "No message to display."
-      index:
-          status_messages: "status messages"
   people:
       person:
           pending_request: "pending request"

From 5ae4248b3007504d2af26945f8a7982df73ed2c2 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 10 Nov 2010 22:07:40 +0100
Subject: [PATCH 14/15] some more fixes I overlooked. Sorry

---
 app/views/layouts/application.mobile.haml | 2 +-
 app/views/registrations/edit.html.haml    | 8 ++++----
 config/locales/diaspora/en.yml            | 8 ++++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

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."

From 1816b1e4dfc131bbe532552b638c76e0f3888487 Mon Sep 17 00:00:00 2001
From: Jonne Hass <pr0fkill@gmail.com>
Date: Thu, 11 Nov 2010 07:27:47 +0100
Subject: [PATCH 15/15] people.show.add_friend -> people.person.add_friend

---
 config/locales/diaspora/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9acaa0429..abb182939 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -254,11 +254,11 @@ en:
           pending_request: "pending request"
           already_friends: "Already friends"
           thats_you: "thats you!"
+          add_friend: "add friend"
       index:
           results_for: "search results for"
       show:
           no_posts: "no posts to display!"
-          add_friend: "add friend"
           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}."