diff --git a/Gemfile b/Gemfile
index 00255c0b26249f9f2fa198742769d77582eb64bb..2efbc6983b88b0269f6da563b2a4e127488bd868 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,7 +71,7 @@ gem 'ruby-oembed'
 gem 'resque', '1.10.0'
 gem 'resque-ensure-connected'
 gem 'resque-timeout', '1.0.0'
-gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
+gem 'SystemTimer', '1.2.3', :platforms => :ruby_18
 
 # reporting
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c84aceccb24127c08bef1f39a8e76fc4df70826e..fd73dbd54564ccee923769f61f0f573cb235c56b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    SystemTimer (1.2.1)
+    SystemTimer (1.2.3)
     abstract (1.0.0)
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
@@ -470,7 +470,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  SystemTimer (= 1.2.1)
+  SystemTimer (= 1.2.3)
   activerecord-import
   acts-as-taggable-on!
   addressable (= 2.2.4)
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 40af7af5976163213221b0afff87c27287f64b1b..309fe888a264021cd61f8aad1d6802a78d4f4fde 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -144,13 +144,15 @@ class PhotosController < ApplicationController
     if user_signed_in?
       @photo = current_user.find_visible_shareable_by_id(Photo, params[:id])
     else
-      @photo = Photo.where(id => params[:id], :public => true)
+      @photo = Photo.where(:id => params[:id], :public => true).first
     end
 
     if @photo
       respond_with @photo
-    else
+    elsif user_signed_in?
       redirect_to :back
+    else
+      redirect_to new_user_session_path
     end
   end
 
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 24176a87aa3df501c9f211682dd24e6071716d80..7d83325a440ad5f5ca6b08ee3745a2ea0c206d40 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -43,10 +43,9 @@
 
     - unless @landing_page
       = include_javascripts :main
-      -if current_user
-        :javascript
-          Diaspora.I18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}");
-          Diaspora.Page = "#{params[:controller].camelcase}#{params[:action].camelcase}";
+      :javascript
+        Diaspora.I18n.loadLocale(#{get_javascript_strings_for(I18n.locale).to_json}, "#{I18n.locale}");
+        Diaspora.Page = "#{params[:controller].camelcase}#{params[:action].camelcase}";
     - if current_user
       = include_javascripts :flash_socket #unless modern_browser?
       = javascript_include_tag 'web-socket-receiver'
diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index 35f1e63f4690ebd1a314ed0b16ed4b1e5a2c862b..f3e6065b0c0944b823d41e8f7f500cfa40b6a988 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -31,8 +31,12 @@
           #publisher_textarea_wrapper
             = link_to( image_tag('deletelabel.png'), "#", :id => "hide_publisher", :title => t('.discard_post'))
             %ul#photodropzone
-            = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind'),
-              :title => "#{popover_with_close_html("1. #{t('shared.public_explain.share')}")}", 'data-content' => t('shared.public_explain.new_user_welcome_message')
+            - if current_user.getting_started?
+              = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind'),
+                :title => popover_with_close_html( '1. ' + t('shared.public_explain.share') ),
+                'data-content' => t('shared.public_explain.new_user_welcome_message')
+            - else
+              = status.text_area :fake_text, :rows => 2, :value => h(publisher_formatted_text), :tabindex => 1, :placeholder => t('.whats_on_your_mind')
             = status.hidden_field :text, :value => h(publisher_hidden_text), :class => 'clear_on_submit'
 
             #file-upload{:title => t('.upload_photos')}
@@ -54,7 +58,7 @@
                 = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider.titleize, :class => "service_icon dim", :id =>"#{service.provider}", :maxchar => "#{service.class::MAX_CHARACTERS}"
             = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')
 
-          .dropdown{:class => "hang_right", :title => popover_with_close_html("2. #{t('shared.public_explain.control_your_audience')}"), 'data-content'=> t('shared.public_explain.visibility_dropdown')}
+          .dropdown{ ! current_user.getting_started? ? {:class => "hang_right"} : { :class => "hang_right", :title => popover_with_close_html("2. #{t('shared.public_explain.control_your_audience')}"), 'data-content'=> t('shared.public_explain.visibility_dropdown')} }
             .button.toggle.publisher
               - if publisher_public
                 = t('public')
@@ -69,7 +73,7 @@
             .wrapper
               %ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => (person.id if defined?(person) && person), 'data-service_uid' => (service_uid if defined?(service_uid))}
                 %li.public.radio{"data-aspect_id" => "public", :class => ("selected" if publisher_public)}
-                  Public
+                  = t('public')
 
                 %li.divider.all_aspects.radio{:style => "border-bottom: 1px solid #ddd;", "data-aspect_id" => "all_aspects", :class => ("selected" if (!publisher_public && all_aspects_selected?(selected_aspects)))}
                   = t('all_aspects')
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 8a13aaa16283780d5d7fbdb64f9cd0f672b3b24d..f298ab84705a28132810dbb4158f5efe70b54fb9 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -27,7 +27,7 @@
     %h5
       = t('aspects.index.new_here.title')
   .content
-    != t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => "NewHere")))
+    != t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => t('shared.publisher.new_user_prefill.newhere'))))
     %br
     = link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee")
 
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index c22d3815df4b18354b385f3731e0e9204f9932eb..4e98dcbbfc3bdb57ac69b8ce1a8fead66791fa1a 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -4,7 +4,8 @@
 
 require File.join(Rails.root, 'lib/messagebus/mailer')
 Diaspora::Application.configure do
-  config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].authority }
+  config.action_mailer.default_url_options = {:protocol => AppConfig[:pod_uri].scheme,
+                                              :host => AppConfig[:pod_uri].authority }
 
   unless Rails.env == 'test' || AppConfig[:mailer_on] != true
     if AppConfig[:mailer_method] == 'messagebus'
diff --git a/config/locales/devise/devise.da.yml b/config/locales/devise/devise.da.yml
index 215ec6c0ce337be1b8efdb66ed9aef5332998ee9..3f91b83e3f4fa9897c6de6e023a79a8f9e0a6f72 100644
--- a/config/locales/devise/devise.da.yml
+++ b/config/locales/devise/devise.da.yml
@@ -30,33 +30,33 @@ da:
       hello: "Hej %{email}!"
       invitation_instructions:
         accept: "Accepter invitation"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Det sociale netværk du har ventet på, er kommet. Ombygget, sikrere og sjovere, er %{strong_diaspora} klar til at hjælpe dig med at dele og udforske web på en helt ny måde."
+        be_yourself: "Vær dig selv"
+        be_yourself_paragraph: "Internettet har skabt nye unikke måder vi kan udtrykke os på. %{strong_diaspora} lader dig være dig selv og dele som du ønsker det, med eller uden dit rigtige navn."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Ser e-mailen forkert ud? %{link} i din browser"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        email_us: "For generelle spørgsmål eller hjælp med din Diaspora-konto, send venligst en email til os på %{email}."
+        finally: "Endelig er det her"
+        friends_saying: "Hvad dine venner siger..."
+        get_connected: "Kobl dig på"
+        get_connected_paragraph: "Som en international bevægelse med en fælles vision for et bedre web, er %{strong_diaspora}'s vigtigste funktion brugerne. Mød nye mennesker, del med vennerne og hav det sjovt med alle andre."
+        have_fun: "Hav det sjovt"
+        have_fun_paragraph: "%{strong_diaspora} handler om at opdage nyt fantastisk indhold og nye mennesker online. %{link}, verdens første %{strong_diaspora} program er kun begyndelsen. Saml og del med hele det utrolige web."
+        help_fund: "støt Diaspora økonomisk"
+        here: "her"
         ignore: "Hvis du ikke vil acceptere invitationen skal du blot ignorere denne mail."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Kom med på holdet"
+        love: "Kærlig hilsen,"
+        made_by_people: "%{strong_diaspora} er skabt af folk der elsker internettet lige så meget som du gør. %{jointeam}, eller %{helpfund}!"
+        more_people: "Endnu flere vil gerne møde dig!"
         no_account_till: "Din konto vil ikke blive oprettet før du har klikket ind på ovenstående link, og skriver dig op."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "eller"
+        sign_up_now: "Tilmeld dig nu &rarr;"
         subject: "Du er blevet inviteret til at bruge Diaspora!"
         team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        unsubscribe: "Hvis du gerne vil holde op med at få e-mails som denne, klik %{link}."
+        view_in: "Se i"
       inviter:
         accept_at: "på %{url}, du kan acceptere ved at følge linket nedenunder."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 7e3e532961081f39075b38a69a2d36ec9f32e75f..a6c2e2fdf1615d7c979dd632f3ec05e29851d4d4 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -30,33 +30,33 @@ fr:
       hello: "Bonjour %{email} !"
       invitation_instructions:
         accept: "Accepter l'invitation"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "Le réseau social que vous avez tant attendu est arrivé. Redessiné, plus sûr et plus fun, {strong_diaspora} est prêt à vous aider pour partager et explorer le web d'une toute nouvelle manière."
+        be_yourself: "Soyez vous-même"
+        be_yourself_paragraph: "L'Internet a créé de nouvelles façons uniques pour nous de nous exprimer. %{strong_diaspora} vous permet d'être vous-même et de partager comme vous le voulez, avec ou sans votre vrai nom."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Ce courriel ne s'affiche pas correctement ? %{link} dans votre navigateur"
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        email_us: "Pour des renseignements généraux ou de l'aide sur votre compte Diaspora, merci de nous envoyer un courriel à %{email}."
+        finally: "Enfin - c'est ici"
+        friends_saying: "Ce que disent vos amis..."
+        get_connected: "Soyez Connecté"
+        get_connected_paragraph: "Un mouvement international avec une vision partagée pour un meilleur web,  la première caractéristique de %{strong_diaspora} est sa communauté. Rencontrez de nouvelles personnes, connectez-vous avec vos amis, et amusez-vous."
+        have_fun: "Prenez plaisir"
+        have_fun_paragraph: "%{strong_diaspora} est tout un projet étonnant permettant de découvrir de nouveaux contenus et des gens en ligne. %{link}, la première application %{strong_diaspora}, et c'est juste le commencement. Recueillir et partager sur le Web dans toute sa gloire."
+        help_fund: "aider à financer Diaspora"
+        here: "ici"
         ignore: "Si vous ne voulez pas accepter l'invitation, merci d'ignorer ce courriel."
-        join_team: "Join our Team"
-        love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        join_team: "Rejoignez notre Équipe"
+        love: "Cordialement,"
+        made_by_people: "%{strong_diaspora} est fait par des gens qui aiment l'Internet autant que vous. %{jointeam}, ou %{helpfund} !"
+        more_people: "Encore plus de gens sont ravis de vous voir !"
         no_account_till: "Votre compte ne sera créé que lorsque vous irez sur le lien ci-dessus et que vous vous inscrirez."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "ou"
+        sign_up_now: "Inscrivez-vous →"
         subject: "Vous avez été invité à rejoindre Diaspora!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "L'Équipe Diaspora"
+        unsubscribe: "Pour vous désinscrir, merci de cliquer %{link}."
+        view_in: "Afficher dans"
       inviter:
         accept_at: "à %{url}, vous pouvez l'accepter à travers le lien ci-dessous."
         has_invited_you: "%{name}"
diff --git a/config/locales/devise/devise.ko.yml b/config/locales/devise/devise.ko.yml
index 3a0c7c8cffb2627565ba7ea57d3ad201634fe62c..26a9042866659a0e075532fd5b1b5ed0c5fc2fe8 100644
--- a/config/locales/devise/devise.ko.yml
+++ b/config/locales/devise/devise.ko.yml
@@ -30,32 +30,32 @@ ko:
       hello: "%{email} 님 환영합니다!"
       invitation_instructions:
         accept: "초대 수락하기"
-        arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
-        be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
+        arrived: "내가 기다리던 소셜 네트워크! 더 재미있고, 더 안전하고, 더 나아진 %{strong_diaspora}는 내가 완전히 새로운 방법으로 웹을 공유하고 탐험할 수 있도록 도울 준비가 되었습니다."
+        be_yourself: "나를 나답게"
+        be_yourself_paragraph: "인터넷이 우리 스스로를 표현하기 위한 독특하고 새로운 여러 방법을 만들었습니다. %{strong_diaspora}는 내가 나일 수 있게 하고, 원하는 사람들과만 공유할 수 있게 하며, 실명과 익명을 가리지 않습니다."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "이메일이 틀리게 표시되면 브라우저에서 %{link}를 클릭하십시오."
         email_address: questions@joindiaspora.com
-        email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
-        get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
-        have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        email_us: "내 디아스포라 계정에 대한 문의는 %{email} 에 이메일로 보내주십시오."
+        finally: 마침내!
+        friends_saying: "내 친구들의 말"
+        get_connected: "동참하세요"
+        get_connected_paragraph: "더 나은 웹이라는 같은 비전을 가진 세계적 운동인 %{strong_diaspora}의 가장 큰 특징은 커뮤니티입니다. 새 사람들을 만나고, 친구들과 연결하고, 즐거움에 동참하십시오."
+        have_fun: "즐기세요"
+        have_fun_paragraph: "%{strong_diaspora}는 온라인에서 놀라운 새 컨텐츠와 사람들을 찾는 방법입니다. 세계 최초의 %{strong_diaspora} 애플리케이션인 %{link}는 시작일 뿐입니다. 이를 누리며 웹을 모으고 공유하십시오."
+        help_fund: "기금 마련"
+        here: "여기"
         ignore: "초대를 수락하지 않으려면 이 메일을 무시하세요."
-        join_team: "Join our Team"
+        join_team: "팀에 합류"
         love: "Love,"
-        made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
-        more_people: "Even more people are excited to see you!"
+        made_by_people: "%{strong_diaspora}는 내가 그렇듯 인터넷을 사랑하는 사람들이 만들었습니다. %{jointeam}하거나 %{helpfund}을 도와주세요!\n"
+        more_people: "더 많은 사람들이 나를 기대하고 있습니다!"
         no_account_till: "계정은 가입하지 않는 한 만들어지지 않습니다."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "또는"
+        sign_up_now: "바로 가입하세요 &rarr;"
         subject: "디아스포라로 초대합니다!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
+        team_diaspora: "디아스포라 팀"
+        unsubscribe: "앞으로 받고싶지 않다면 %{link}를 클릭하십시오."
         view_in: "View in"
       inviter:
         accept_at: "%{URL}에서, 아래의 링크를 통해 확인할 수 있습니다."
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 664e60d01277dd8d4eff60b817f6aa763e4451f1..583d91606fb5dadfffb7216c232ff99335c0cd47 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -9,7 +9,7 @@ ru:
       confirmed: "Ваш аккаунт подтверждён. Добро пожаловать."
       new:
         resend_confirmation: "Выслать повторно инструкции по подтверждению"
-      send_instructions: "Вы получите письмо с указаниями по подтверждению учётной записи в течение нескольких минут."
+      send_instructions: "Вы получите письмо с указаниями по подтверждению аккаунта в течение нескольких минут."
     failure:
       inactive: "Ваш аккаунт ещё не активирован."
       invalid: "Неверный email или пароль."
@@ -19,18 +19,18 @@ ru:
       unauthenticated: "Вы должны войти или зарегистрироваться, прежде чем продолжить."
       unconfirmed: "Вам необходимо подтвердить ваш аккаунт, прежде чем продолжить."
     invitations:
-      invitation_token_invalid: "Введённый вами код приглашения не действителен!"
+      invitation_token_invalid: "Введённый вами код приглашения недействителен!"
       send_instructions: "Ваше приглашение отправлено."
       updated: "Пароль установлен. Добро пожаловать."
     mailer:
       confirmation_instructions:
         confirm: "Подтвердить мой аккаунт"
         subject: "Инструкции по подтверждению"
-        you_can_confirm: "Вы можете подтвердить ваш аккаунт перейдя по ссылке:"
+        you_can_confirm: "Вы можете подтвердить ваш аккаунт, перейдя по ссылке:"
       hello: "Привет %{email}!"
       invitation_instructions:
         accept: "Принять приглашение"
-        arrived: "Социальная сеть, которую вы так долго ждали, наконец, появилась. Обновленная, более защищенная и более дружелюбная, %{strong_diaspora} готова помочь вам делиться и исследовать Сеть по-новому."
+        arrived: "Социальная сеть, которую вы так долго ждали, наконец появилась. Обновленная, более защищенная и более дружелюбная, %{strong_diaspora} готова помочь вам делиться и исследовать Сеть по-новому."
         be_yourself: "Будьте собой"
         be_yourself_paragraph: "Интернет дал нам множество уникальных способов самовыражения. %{strong_diaspora} позволяет вам быть собой и делиться чем угодно, как под настоящим именем, так и под псевдонимом."
         cubbies: Cubbi.es
@@ -45,34 +45,34 @@ ru:
         have_fun_paragraph: "Основная задача %{strong_diaspora} — помочь вам находить новую качественную информацию и интересных людей. %{link}, первое в мире приложение для %{strong_diaspora}, это только начало. Собирайте и делитесь своими лучшими находками в сети."
         help_fund: "помогите финансировать Диаспору"
         here: "сюда"
-        ignore: "Если вы не хотите принимать приглашение, проигнорируйте."
+        ignore: "Если вы не хотите принимать приглашение, проигнорируйте это письмо."
         join_team: "Присоединяйтесь к нам"
         love: "С любовью,"
-        made_by_people: "%{strong_diaspora} создается людьми, которые любят Интернет так же, как и вы. %{jointeam} или %{helpfund}!"
-        more_people: "Даже больше людей рады видеть вас!"
-        no_account_till: "Ваш аккаунт не будет создан, пока вы не зарегистрировались."
+        made_by_people: "%{strong_diaspora} создается людьми, которые любят интернет так же, как и вы. %{jointeam} или %{helpfund}!"
+        more_people: "Еще больше людей рады видеть вас!"
+        no_account_till: "Ваш аккаунт не будет создан, пока вы не перейдете по ссылке выше."
         or: "или"
         sign_up_now: "Зарегистрируйтесь сейчас &rarr;"
-        subject: "Вы приглашены присоединиться к диаспоре!"
+        subject: "Вы приглашены присоединиться к Диаспоре!"
         team_diaspora: "Команда Диаспоры"
         unsubscribe: "Чтобы отписаться, нажмите %{link}."
         view_in: "Открыть в"
       inviter:
         accept_at: "в %{url}, вы можете принять его по ссылке ниже."
         has_invited_you: "%{name}"
-        have_invited_you: "%{names} пригласил[а,и] вас присоединиться к диаспоре"
+        have_invited_you: "%{names} приглашает вас присоединиться к Диаспоре"
       reset_password_instructions:
         change: "Изменить пароль"
         ignore: "Если вы не совершали запрос, проигнорируйте это письмо."
-        someone_requested: "Кто то создал запрос смены вашего пароля, и вы можете сделать это перейдя по ссылке ниже."
+        someone_requested: "Кто-то создал запрос смены вашего пароля и вы можете сделать это, перейдя по ссылке ниже."
         subject: "Инструкции по сбросу пароля"
-        wont_change: "Ваш пароль не изменится, пока вы не перейдёте по ссылке и не создадите новый."
+        wont_change: "Ваш пароль не изменится, пока вы не перейдёте по ссылке выше и не создадите новый пароль."
       unlock_instructions:
-        account_locked: "Ваш аккаунт из-за чрезмерного количества неудачных попыток входа заблокирован."
+        account_locked: "Ваш аккаунт заблокирован из-за чрезмерного количества неудачных попыток входа."
         click_to_unlock: "Используйте ссылку, чтобы разблокировать аккаунт:"
         subject: "Инструкции по разблокированию"
         unlock: "Разблокировать мой аккаунт"
-      welcome: "Добро пожаловать %{email}!"
+      welcome: "Добро пожаловать, %{email}!"
     passwords:
       edit:
         change_password: "Изменить пароль"
@@ -89,8 +89,8 @@ ru:
     sessions:
       new:
         alpha_software: "Вы собираетесь использовать альфа версию программного обеспечения."
-        bugs_and_feedback: "Имейте в виду, вы будете сталкиваться с ошибками. Мы рекомендуем вам использовать кнопку Обратная связь с правой стороны браузера! Мы будем решать ошибки так быстро, как сможем."
-        bugs_and_feedback_mobile: "Будьте готовый столкнуться с ошибками. О которых мы просим вас сообщать незамедлительно! Мы постараемся решить вашу проблему в кротчайшие сроки."
+        bugs_and_feedback: "Имейте в виду, вы будете сталкиваться с ошибками. Мы рекомендуем вам использовать кнопку Обратная связь с правой стороны браузера! Мы будем исправлять ошибки так быстро, как сможем."
+        bugs_and_feedback_mobile: "Будьте готовы столкнуться с ошибками. Мы просим вас сообщать о любых мелочах! Мы постараемся исправлять ошибки в кратчайшие сроки."
         login: "Логин"
         modern_browsers: "поддерживает только современные браузеры."
         password: "Пароль"
@@ -106,14 +106,14 @@ ru:
         receive_unlock: "Не получили инструкции по разблокированию?"
         sign_in: "Войти"
         sign_up: "Регистрация"
-        sign_up_closed: "Регистрация на данный момент не доступна."
+        sign_up_closed: "Регистрация на данный момент недоступна."
       mail_signup_form:
         sign_up_for_an_invite: "Зарегистрируйтесь для приглашения!"
     unlocks:
       new:
         resend_unlock: "Отправить инструкции по разблокированию повторно"
-      send_instructions: "Вы получите email с указаниями по разблокированию учётной записи в течение нескольких минут."
-      unlocked: "Ваш аккаунт разблокированна. С возвращением."
+      send_instructions: "Вы получите email с указаниями по разблокированию аккаунта в течение нескольких минут."
+      unlocked: "Ваш аккаунт разблокирован."
   errors:
     messages:
       already_confirmed: "уже подтверждено"
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index ebc3a4e5de6ebfa7b6827f529f1bc13a534ccf75..5060ccfe1322bf67edcf4ba153657602013a22f4 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -31,32 +31,32 @@ sk:
       invitation_instructions:
         accept: "Prijať pozvanie"
         arrived: "The social network you have been waiting for has arrived. Revamped, more secure, and more fun, %{strong_diaspora} is ready to help you share and explore the web in a whole new way."
-        be_yourself: "Be Yourself"
+        be_yourself: "Buďte sami sebou"
         be_yourself_paragraph: "The Internet has created unique new ways for us to express ourselves. %{strong_diaspora} lets you be yourself and share however you want, with or without your real name."
         cubbies: Cubbi.es
-        displaying_correctly: "Email not displaying correctly? %{link} in your browser"
+        displaying_correctly: "Nezobrazuje sa e-mail správne? %{link} vo vašom prehliadači"
         email_address: questions@joindiaspora.com
         email_us: "For general inquiries or support with your Diaspora account, please email us at %{email}."
-        finally: "Finally - it's here"
-        friends_saying: "What your friends are saying..."
-        get_connected: "Get Connected"
+        finally: "Napokon – je to tu"
+        friends_saying: "Čo hovoria vaši priatelia..."
+        get_connected: "Pripojte sa"
         get_connected_paragraph: "An international movement with a shared vision for a better web, %{strong_diaspora}'s #1 feature is its community. Meet new people, connect with friends, and join the fun."
-        have_fun: "Have Fun"
+        have_fun: "Bavte sa"
         have_fun_paragraph: "%{strong_diaspora} is all about discovering amazing new content and people online. %{link}, the world's first %{strong_diaspora} application is just the begining. Collect and share the web in all of its glory."
-        help_fund: "help fund Diaspora"
-        here: "here"
+        help_fund: "pomôžte financovať Diasporu"
+        here: "sem"
         ignore: "Ak nechcete prijať toto pozvanie, ignorujte, prosím, tento e-mail."
-        join_team: "Join our Team"
-        love: "Love,"
+        join_team: "Pripojte sa k nášmu tímu"
+        love: "S láskou"
         made_by_people: "%{strong_diaspora} is made by people who love the Internet as much as you do. %{jointeam}, or %{helpfund}!"
         more_people: "Even more people are excited to see you!"
         no_account_till: "Váš účet sa nevytvorí, kým nekliknete na odkaz vyššie a nezaregistrujete sa."
-        or: "or"
-        sign_up_now: "Sign up now &rarr;"
+        or: "alebo"
+        sign_up_now: "Zaregistrujte sa teraz &rarr;"
         subject: "Pozvali vás na Diasporu!"
-        team_diaspora: "Team Diaspora"
-        unsubscribe: "To unsubscribe please click %{link}."
-        view_in: "View in"
+        team_diaspora: "Tím Diaspory"
+        unsubscribe: "Ak už nechcete dostávať e-maily, kliknite %{link}."
+        view_in: "Zobraziť v"
       inviter:
         accept_at: "Kliknutím na odkaz na stránku %{url} ho môžete prijať."
         has_invited_you: "%{name}"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 9453c0b17cf02400b2306a4369819905593e8379..382a46852986f85aabbaed9f686399d0316b38ef 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -750,6 +750,7 @@ ar:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "انشر رسالة إلى %{aspect}"
       posting: "يَنشُر ..."
       publishing_to: "نشر إلى: "
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 94fcba2c6f58c4eaf8278c4857359129374b822f..a6400bbf50a0257302990a4c4aa864635d982ff5 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -750,6 +750,7 @@ bg:
         hello: "Привет на всички, аз съм #%{new_user_tag}."
         i_like: "Интересува ме %{tags}."
         invited_by: "Благодаря за поканата, "
+        newhere: "НовТук"
       post_a_message_to: "Публикувайте публично съобщение в %{aspect}"
       posting: Публикуване...
       publishing_to: "публикуване в: "
@@ -799,7 +800,7 @@ bg:
   streams:
     aspects:
       title: "Вашите аспекти"
-    aspects_stream: "Аспекти"
+    aspects_stream: "От вашите аспекти"
     commented_on: "коментирани"
     community_spotlight_stream: "От \"В центъра на вниманието\""
     followed_tag:
@@ -822,7 +823,7 @@ bg:
     recently: "наскоро:"
     tags:
       contacts_title: "Хора, които харесват марката"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Мисля, че %{tag_name}..."
       title: "Публикации маркирани с \"%{tags}\""
   tag_followings:
     create:
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 3943e007aaa4e493258540c379f405a7c3c4e2b8..713f53dc2087084c1758a7edd3b49a3680834e12 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -750,6 +750,7 @@ br:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Skrivañ ur c'hemennad da %{aspect}"
       posting: "Oc'h embann..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 97ffc7f81bbde55a73dcb49fa0c81d1db9d4edbe..3759fb417043c7d8dcc07bd6eca312211a3f5777 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -750,6 +750,7 @@ cs:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: Odesílání...
       publishing_to: "publikování na:"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 87dab7ad8e98b15242181f12dfa57beb0afe1b5b..963e6683e08f2a7d960dd715893fa7de21ca2e31 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -420,7 +420,7 @@ cy:
       other: "%{actors} mentioned you in a deleted post."
       two: "%{actors} mentioned you in a deleted post."
       zero: "%{actors} mentioned you in a deleted post."
-    post: "post"
+    post: "bost"
     private_message:
       few: "Mae %{actors} wedi anfon neges iddych chi."
       many: "Mae %{actors} wedi anfon neges iddych chi."
@@ -750,6 +750,7 @@ cy:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post neges i %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
@@ -800,7 +801,7 @@ cy:
     aspects:
       title: "Eich Agweddau"
     aspects_stream: "Aspects"
-    commented_on: "wedi sylwad ar"
+    commented_on: "wedi sylwad arno"
     community_spotlight_stream: "Community Spotlight"
     followed_tag:
       add_a_tag: "Ychwanegu tag"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index f61c5a945176365e6d4396021fc06eaf2eb7dbbd..e4f93edec34e4e37f5a4b1911e007e8680c51828 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -78,7 +78,7 @@ da:
     edit:
       add_existing: "Tilføj en eksisterende kontakt "
       aspect_list_is_not_visible: "aspekt liste er gemt for andre i aspektet"
-      aspect_list_is_visible: "aspekt lise er synlig for andre i aspektet"
+      aspect_list_is_visible: "aspektliste er synlig for andre i aspektet"
       confirm_remove_aspect: "Er du sikker på du vil slette dette aspekt?"
       done: "Gennemført"
       make_aspect_list_visible: "gør kontakter i dette aspekt synlige for hinanden?"
@@ -111,16 +111,16 @@ da:
         here_to_help: "Diaspora samfundet er her!"
         need_help: "Brug for hjælp?"
         satisfaction: "%{link}: Samfunds-drevet support"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Samfundsdrevne selvinstruktioner, vejledninger og nyheder"
       introduce_yourself: "Dette er din strøm. Hop ud i det og introducér dig selv."
       keep_us_running: "Hold %{pod} kørende hurtigt og køb serverne deres kaffe fix med en månedlig donation!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
+        follow: "Følg %{link} og byd nye brugere velkommen til Diaspora*!"
         learn_more: "Lær mere"
-        title: "Welcome New Users"
+        title: "Byd nye brugere velkommen"
       no_contacts: "Ingen kontakter"
       no_tags: "+ Find et tag for at følge"
       people_sharing_with_you: "Personer der deler med dig"
@@ -142,7 +142,7 @@ da:
     no_contacts_message:
       community_spotlight: "kreative medlemmer"
       or_spotlight: "Eller du kan dele med %{link}"
-      try_adding_some_more_contacts: "Du kan søge (øverst) eller invitere (til højre) flere kontakter."
+      try_adding_some_more_contacts: "Du kan søge (øverst) eller invitere flere kontakter (til højre)."
       you_should_add_some_more_contacts: "Du bør tilføje nogle flere kontakter!"
     no_posts_message:
       start_talking: "Ingen har sagt noget endnu. Start samtalen!"
@@ -172,11 +172,11 @@ da:
   back: "Tilbage"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Ignorering af bruger mislykkedes.  #evasion"
+      success: "Ignorering succesfuld - du kommer ikke til at se den bruger i din strøm igen. #silencio!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Fjernelse af ignorering mislykkedes.  #evasion"
+      success: "Se hvad de har at sige! #sayhello"
   bookmarklet:
     explanation: "Skriv indlæg på Diaspora fra hvor som helst ved at bookmarke %{link}."
     explanation_link_text: "dette link"
@@ -205,7 +205,7 @@ da:
       check_out: "Tjek"
       many_people_are_you_sure: "Er du sikker på du vil starte en privat samtale med mere end %{suggested_limit} kontakter? Et indlæg til dette aspekt kan være en bedre måde at kontakte dem."
       my_contacts: "Mine kontakter"
-      no_contacts: "Det ser ud til at du bliver nød til at tilføje nogle kontakter!"
+      no_contacts: "Det ser ud til at du bliver nødt til at tilføje nogle kontakter!"
       only_sharing_with_me: "Deler kun med mig"
       remove_person_from_aspect: "Fjern %{person_name} fra \"%{aspect_name}\""
       start_a_conversation: "Start en samtale"
@@ -236,8 +236,8 @@ da:
         zero: "Ingen nye beskeder"
     index:
       create_a_new_message: "Opret ny besked"
-      inbox: "Inbox"
-      message_inbox: "Besked Inbox"
+      inbox: "Indbakke"
+      message_inbox: "Indbakke til beskeder"
       new_message: "Ny besked"
       no_conversation_selected: "ingen samtale valgt"
       no_messages: "ingen beskeder"
@@ -494,7 +494,7 @@ da:
       results_for: " resultat for %{params}"
     index:
       couldnt_find_them_send_invite: "Kunne ikke finde dem? Send en invitation!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Leder du efter indlæg tagget med %{tag_link}?"
       no_one_found: "... Og ingen blev fundet."
       no_results: "Hey! Du er nødt til at søge efter noget."
       results_for: "søgeresultater for"
@@ -544,7 +544,7 @@ da:
       runtime_error: "Billed-upload fejlede. Er du sikker på at du har spændt sikkerhedsselen?"
       type_error: "Billed-upload fejlede. Er du sikker på at et billede var tilføjet?"
     destroy:
-      notice: "Billed slettet."
+      notice: "Billede slettet."
     edit:
       editing: "Redigering"
     new:
@@ -556,7 +556,7 @@ da:
       invalid_ext: "{file} har en ugyldig filtype. Kun {udvidelser} er tilladt."
       size_error: "{File} er for stor. Maksimal filstørrelse er {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "eller vælg et fra dine eksisterende %{photos}"
       upload: "Upload et nyt profilbillede!"
     photo:
       view_all: "se alle %{name}s billeder"
@@ -577,7 +577,7 @@ da:
       not_found: "Vi kunne desværre ikke finde dette indlæg."
       permalink: "permalink"
   previous: "Forrige"
-  privacy: "Privacy"
+  privacy: "Privatindstillinger"
   profile: "Profil"
   profiles:
     edit:
@@ -619,7 +619,7 @@ da:
       unhappy: Ulykkelig?
       update: "Opdatér"
     new:
-      create_my_account: "Opret min konto"
+      create_my_account: "Opret min konto!"
       enter_email: "Indtast e-mail"
       enter_password: "Indtast en adgangskode"
       enter_password_again: "Indtast den samme adgangskode som før"
@@ -657,7 +657,7 @@ da:
         few: "%{count} delinger"
         many: "%{count} delinger"
         one: "Én deling"
-        other: "%{count} deling"
+        other: "%{count} delinger"
         two: "%{count} delinger"
         zero: "Del"
       reshare_confirmation: "Del %{author} - %{text}?"
@@ -675,7 +675,7 @@ da:
     failure:
       error: "der opstod en fejl i at forbinde til den service"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora indsamler dine %{service}-venner. Vent venligst et par minutter."
       no_friends: "Ingen Facebook-venner fundet."
       service_friends: "%{service} Venner"
     index:
@@ -697,8 +697,8 @@ da:
   settings: "Indstillinger"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "%{name}'s indlæg er nu skjult, og meddelelser er blevet gjort tavse."
+      see_it_on_their_profile: "Hvis du ønsker at se opdateringer til dette indlæg, besøg %{name}'s profilside."
   shared:
     add_contact:
       add_new_contact: "Tilføj en ny kontakt"
@@ -749,23 +749,24 @@ da:
       new_user_prefill:
         hello: "Hej allesammen, jeg er #%{new_user_tag}. "
         i_like: "Jeg interesserer mig for %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Tak for invitationen, "
+        newhere: "NewHere"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: Sender...
       publishing_to: "del med: "
       share: "Del"
       share_with: "Del med"
       upload_photos: "Upload fotos"
-      whats_on_your_mind: "Hvad har du på hjertet?"
+      whats_on_your_mind: "Hvad har du på hjerte?"
     reshare:
       reshare: "Del igen"
     stream_element:
       connect_to_comment: "Forbind til denne bruger for at kommentere på deres indlæg"
       currently_unavailable: "Det er i øjeblikket ikke muligt at kommentere"
       dislike: "Synes ikke om"
-      hide_and_mute: "Skjul indlæg og kommentarer"
+      hide_and_mute: "Skjul indlægget og dets kommentarer"
       ignore_user: "Ignorer %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user_description: "Ignorer og fjern bruger fra alle aspekter?"
       like: "Synes om"
       shared_with: "Delt med: %{aspect_names}"
       unlike: "Synes ikke om"
@@ -790,12 +791,12 @@ da:
   stream_helper:
     hide_comments: "Skjul alle kommentarer"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Vis %{count} flere kommentarer"
+      many: "Vis %{count} flere kommentarer"
+      one: "Vis én kommentar mere"
+      other: "Vis %{count} flere kommentarer"
+      two: "Vis to kommentarer til"
+      zero: "Ikke flere kommentarer"
   streams:
     aspects:
       title: "Dine aspekter"
@@ -822,15 +823,15 @@ da:
     recently: "for nylig:"
     tags:
       contacts_title: "Folk der følger disse tags"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Jeg synes at %{tag_name} er... "
       title: "Indlæg tagget med: %{tags}"
   tag_followings:
     create:
-      failure: "Det lykkedes ikke at følge: #%{name}"
-      success: "Følger nu: #%{name}"
+      failure: "Det lykkedes ikke at følge: #%{name}. Følger du allerede tag'et?"
+      success: "Du følger nu #%{name}."
     destroy:
-      failure: "Fejlede med at holde op med følgende: #%{name}"
-      success: "Holdt op med at følge #%{name} med succes"
+      failure: "Fejlede med at holde op med at følge #%{name}. Måske har du allerede valgt ikke at følge tag'et?"
+      success: "Du følger desværre ikke #%{name} længere."
   tags:
     show:
       follow: "Følg #%{tag}"
@@ -860,9 +861,9 @@ da:
       email_confirmed: "E-mail %{email} aktiveret"
       email_not_confirmed: "E-mail kunne ikke aktiveres. Forkert link?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Indtast venligst dit kodeord for at lukke din konto."
+      success: "Din konto er nu låst. Det kan tage 20 minutter for os at blive færdige med at lukke den helt. Tak fordi du prøvede Diaspora."
+      wrong_password: "Det indtastede kodeord stemmer ikke overens med dit nuværende kodeord."
     edit:
       also_commented: "...nogen har kommenteret på en af dine kontakters indlæg?"
       change: "Skift"
@@ -876,7 +877,7 @@ da:
       download_xml: "Download min XML"
       edit_account: "Rediger konto"
       email_awaiting_confirmation: "Vi har sendt dig et aktiveringslink til %{unconfirmed_email}. Indtil du følger dette link og aktiverer den nye adresse, vil vi fortsætte med at bruge din oprindelige adresse %{email}."
-      export_data: "Exportér data"
+      export_data: "Eksportér data"
       getting_started: "Ny bruger opsætning"
       liked: "...nogen synes om dit indlæg?"
       mentioned: "...du er nævnt i et indlæg?"
@@ -885,7 +886,7 @@ da:
       private_message: "...du har modtaget en besked?"
       receive_email_notifications: "Modtag e-mail notifikation når..."
       reshared: "... nogen deler dit indlæg?"
-      show_community_spotlight: "Hvis Kreative medlemmer i hovedstrøm?"
+      show_community_spotlight: "Vis kreative medlemmer i din hovedstrøm?"
       show_getting_started: "Genaktivér 'Kom godt i gang'"
       started_sharing: "...nogen er begyndt at dele med dig?"
       stream_preferences: "Strøm opsætning"
@@ -910,9 +911,9 @@ da:
       simply_visit: "Du skal blot besøge"
       works_on_modern: "Virker på alle moderne smartphones"
     privacy_settings:
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Ignorerede brugere"
+      stop_ignoring: "Hold op med at ignorere"
+      title: "Privatlivsindstillinger"
     public:
       does_not_exist: "Brugeren %{username} findes ikke!"
     update:
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index ffe48ea0bd9aaffc45ad17262b3985f78cbdb9e3..a54e798d8312dc6bd71f86646ca5024e550d2bd7 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -494,7 +494,7 @@ de:
       results_for: "Ergebnisse für %{params}"
     index:
       couldnt_find_them_send_invite: "Konntest du die gesuchte Person nicht finden? Schicke eine Einladung!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Suchst du mit %{tag_link} getaggte Beiträge?"
       no_one_found: "… und niemand wurde gefunden."
       no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
@@ -750,6 +750,7 @@ de:
         hello: "Hallo zusammen, ich bin #%{new_user_tag}. "
         i_like: "Ich interessiere mich für %{tags}."
         invited_by: "Danke für die Einladung,"
+        newhere: "NeuHier"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
       publishing_to: "Veröffentlichen an: "
diff --git a/config/locales/diaspora/de_formal.yml b/config/locales/diaspora/de_formal.yml
index e33698ff08478fa6e3e7eca1b698cc77e006cb2e..b8c6a3d63a690d1e8efb8c33037638738634758e 100644
--- a/config/locales/diaspora/de_formal.yml
+++ b/config/locales/diaspora/de_formal.yml
@@ -750,6 +750,7 @@ de_formal:
         hello: "Hallo zusammen, ich bin #%{new_user_tag}. "
         i_like: "Ich interessiere mich für %{tags}."
         invited_by: "Danke für die Einladung, "
+        newhere: "NewHere"
       post_a_message_to: "Senden Sie eine Nachricht an %{aspect}"
       posting: "Senden …"
       publishing_to: "Veröffentlichen an: "
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 9e2cfd025b1feb123d1b780f885031a8f71d27d6..cb330c3873165ca88de0e20bb2acb372359e9911 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -750,6 +750,7 @@ el:
         hello: "Γεια σε όλους, είμαι #%{new_user_tag}. "
         i_like: "Με ενδιαφέρουν οι ετικέτες %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: Ανάρτηση...
       publishing_to: "δημοσίευση στο: "
diff --git a/config/locales/diaspora/en_1337.yml b/config/locales/diaspora/en_1337.yml
index 57b7ccd9afb974206d76cd01877ad12ee8237b95..aff0a3f1a5f9a18c25c6765b41f356ade7c30f2a 100644
--- a/config/locales/diaspora/en_1337.yml
+++ b/config/locales/diaspora/en_1337.yml
@@ -750,6 +750,7 @@ en_1337:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "5P4M 7H15 45P3C7: %{aspect}"
       posting: 5P4MM1NG...
       publishing_to: "PUBL15H1NG 2: "
diff --git a/config/locales/diaspora/en_pirate.yml b/config/locales/diaspora/en_pirate.yml
index f99ee3dc22fd26c178237ef46ffbbe994162565c..65827058da664f7c66d99d3a9c548bd143cf84fe 100644
--- a/config/locales/diaspora/en_pirate.yml
+++ b/config/locales/diaspora/en_pirate.yml
@@ -750,6 +750,7 @@ en_pirate:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index a850186fd80bf67b84b0a2670873c30c8b9bbb5c..97d0124dfedfa307f69b87bc601441102490c8a8 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -750,6 +750,7 @@ en_shaw:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: 𐑐𐑴𐑕𐑑𐑦𐑙...
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 656422dc085d477ff469a08b7513277d9d56f9cf..98de6da83dc3c5e5898459b955e4a54871932675 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -111,9 +111,9 @@ eo:
         here_to_help: "Jen la DIASPORA* komunumo!"
         need_help: "Ĉu Vi Bezonas Helpon?"
         satisfaction: "%{link}: Komunuma helpo"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
+        tag_bug: "bug"
+        tag_feature: "feature"
+        tag_question: "question"
         tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Instruiloj, lerniloj kaj novaĵoj funkciigitaj de la komunumo"
       introduce_yourself: "Tio estas via torento. Ensaltu kaj prezentu vin mem."
       keep_us_running: "Helpu %{pod} rapide funkcii kaj aĉetu por niaj servkomputiloj ilian kaforiparon per ĉiumonata donatado!"
@@ -429,19 +429,19 @@ eo:
       two: "%{actors} poŝtis al vi poŝton."
       zero: "%{actors} sendis al vi poŝton."
     reshared:
-      few: "%{actors} rekonigis vian %{post_link}."
+      few: "%{actors} rekonigis vian %{post_link}n."
       many: "%{actors} rekonigis vian %{post_link}."
-      one: "%{actors} repartoprenis vian %{post_link}."
-      other: "%{actors} rekonigis vian %{post_link}."
-      two: "%{actors} rekonigis vian %{post_link}."
-      zero: "%{actors} rekonigis vian %{post_link}."
+      one: "%{actors} repartoprenis vian %{post_link}n."
+      other: "%{actors} rekonigis vian %{post_link}n."
+      two: "%{actors} rekonigis vian %{post_link}n."
+      zero: "%{actors} rekonigis vian %{post_link}n."
     reshared_post_deleted:
-      few: "%{actors} repartoprenis vian foritan afiŝon."
-      many: "%{actors} repartoprenis vian foritan afiŝon."
-      one: "%{actors} repartoprenis vian foritan afiŝon."
-      other: "%{actors} repartoprenis vian foritan afiŝon."
-      two: "%{actors} repartoprenis vian foritan afiŝon."
-      zero: "%{actors} repartoprenis vian foritan afiŝon."
+      few: "%{actors} rekonigis vian forviŝitan afiŝon."
+      many: "%{actors} rekonigis vian forviŝitan afiŝon."
+      one: "%{actors} rekonigis vian forviŝitan afiŝon."
+      other: "%{actors} rekonigis vian forviŝitan afiŝon."
+      two: "%{actors} rekonigis vian forviŝitan afiŝon."
+      zero: "%{actors} rekonigis vian forviŝitan afiŝon."
     started_sharing:
       few: "%{actors} komencis konigi kun vi."
       many: "%{actors} komencis konigi kun vi."
@@ -494,7 +494,7 @@ eo:
       results_for: "rezultoj por %{params}"
     index:
       couldnt_find_them_send_invite: "Ĉu vi ne povis trovi tiun? Sendu inviton!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Ĉu vi serĉas afiŝojn etikeditaj %{tag_link}?"
       no_one_found: "...kaj neniu troviĝis."
       no_results: "Hej! Vi devas serĉi ion."
       results_for: "trovrezultoj por"
@@ -648,22 +648,22 @@ eo:
     new_request_to_person:
       sent: sendita!
   reshares:
-    comment_email_subject: "la repartoprenado de %{resharer} de la afiŝo de %{author}"
+    comment_email_subject: "Rekonigo de %{resharer} de la afiŝo de %{author}"
     create:
-      failure: "Estis eraro, kiam repartoprenanta tiun ĉi afiŝon."
+      failure: "Estis eraro dum rekonigado de ĉi tiu afiŝo."
     reshare:
-      deleted: "Originala afiŝo forlasiĝis de afiŝinto."
+      deleted: "Originala afiŝo forviŝiĝis de l' afiŝinto."
       reshare:
-        few: "%{count} repartoprenadoj"
-        many: "%{count} repartoprenadoj"
-        one: "1 repartoprenado"
-        other: "%{count} repartoprenadoj"
-        two: "%{count} repartoprenadoj"
-        zero: "Repartopreni"
-      reshare_confirmation: "Ĉu repartopreni la afiŝon de %{author}?"
-      reshare_original: "Repartopreni la originalan"
-      reshared_via: "repartoprenita per"
-      show_original: "Videbligi originalan"
+        few: "%{count} rekonigoj"
+        many: "%{count} rekonigoj"
+        one: "1 rekonigo"
+        other: "%{count} rekonigoj"
+        two: "%{count} rekonigoj"
+        zero: "Rekonigi"
+      reshare_confirmation: "Ĉu rekonigi la afiŝon de %{author}?"
+      reshare_original: "Rekonigi la originalon"
+      reshared_via: "rekonigita per"
+      show_original: "Montri la originalon"
   search: "Serĉi"
   services:
     create:
@@ -750,6 +750,7 @@ eo:
         hello: "Saluton al ĉiu, mi estas #%{new_user_tag}. "
         i_like: "Mi interesiĝas pri %{tags}."
         invited_by: "Dankon pro la invito,"
+        newhere: "NewHere"
       post_a_message_to: "Afiŝi al %{aspect}"
       posting: Afiŝanta...
       publishing_to: "koniganta al: "
@@ -790,12 +791,12 @@ eo:
   stream_helper:
     hide_comments: "kaŝi ĉiujn komentojn"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Montri %{count} pliajn komentojn"
+      many: "Montri %{count} pliajn komentojn"
+      one: "Montri unu plian komenton"
+      other: "Montri %{count} pliajn komentojn"
+      two: "Montri du pliajn komentojn"
+      zero: "Neniuj pliaj komentoj"
   streams:
     aspects:
       title: "Viaj Aspektoj"
@@ -884,7 +885,7 @@ eo:
       photo_export_unavailable: "bildeksporto intertempe ne eblas"
       private_message: "...vi ricevas malpublikan mesaĝon?"
       receive_email_notifications: "Ĉu ricevi retpoŝtajn sciigojn, kiam..."
-      reshared: "...iu repartoprenas vian afiŝon?"
+      reshared: "... ĉu iu rekonigis vian afiŝon?"
       show_community_spotlight: "Ĉu montri Komunuman Reflektoron en Torento?"
       show_getting_started: "Reŝalti Komencadon"
       started_sharing: "...iu komencis konigi kun vi?"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 37a0773281119cd6a0045df22b41ab86be2039f7..ebdda586cb8a3bc99ac0fedf6db58e818f192125 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -750,6 +750,7 @@ es-AR:
         hello: "Hola a tod@s, I'm #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: Publicando...
       publishing_to: "publicar en: "
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index bc628fee09497e8dcb7f6c930a64c84aa00dcead..9134a5c9160753bd779f4739cbf6ede5109d768c 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -750,6 +750,7 @@ es-CL:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: Posteando...
       publishing_to: "publicar en: "
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 7335489aa01be7ae84d30cd277f80a16de5e5f44..26b28c4744baf55976f0d216ade89812fbaabbe6 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -200,9 +200,9 @@ es:
     few: "%{count} contactos"
     index:
       add_a_new_aspect: "Añade un nuevo aspecto"
-      add_to_aspect: "añadir contactos a %{name}"
+      add_to_aspect: "añade contactos a %{name}"
       all_contacts: "Todos los contactos"
-      check_out: "Echa un vistazo"
+      check_out: "Echa un vistazo a la"
       many_people_are_you_sure: "¿Estás seguro que quieres comenzar una conversación privada con más de %{suggested_limit} contactos? Publicar en sus aspectos podría ser mejor para contactar con ellos."
       my_contacts: "Mis Contactos"
       no_contacts: "¡Parece que necesitas añadir algunos contactos!"
@@ -494,8 +494,8 @@ es:
       results_for: "resultados para %{params}"
     index:
       couldnt_find_them_send_invite: "¿No les puedes encontrar? ¡Envíales una invitación!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
-      no_one_found: "...y no se ha encontrado nada."
+      looking_for: "¿Buscando publicaciones sobre %{tag_link}?"
+      no_one_found: "...y nadie fue encontrado."
       no_results: "¡Eh! Tienes que buscar algo."
       results_for: "buscar resultados para"
     many: "%{count} personas"
@@ -750,6 +750,7 @@ es:
         hello: "Hola a tod@s, I'm #%{new_user_tag}."
         i_like: "Tengo interés en %{tags}."
         invited_by: "Gracias por la invitación, "
+        newhere: "SoyNuevo"
       post_a_message_to: "Publicar un mensaje en %{aspect}"
       posting: Publicando...
       publishing_to: "publicar en:"
@@ -790,12 +791,12 @@ es:
   stream_helper:
     hide_comments: "Ocultar comentarios"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Mostrar %{count} comentarios más"
+      many: "Mostrar %{count} comentarios más"
+      one: "Mostrar 1 comentario más"
+      other: "Mostrar %{count} comentarios más"
+      two: "Mostrar 2 comentarios más"
+      zero: "No hay más comentarios"
   streams:
     aspects:
       title: "Aspectos"
@@ -822,7 +823,7 @@ es:
     recently: "recientemente:"
     tags:
       contacts_title: "Gente que sigue esta etiqueta"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Sobre %{tag_name}..."
       title: "Publicaciones etiquetadas: %{tags}"
   tag_followings:
     create:
@@ -836,7 +837,7 @@ es:
       follow: "Seguir #%{tag}"
       followed_by: "seguido por"
       following: "Siguiendo a #%{tag}"
-      nobody_talking: "Nadie esta hablando de %{tag} todavía."
+      nobody_talking: "Nadie esta hablando sobre %{tag} todavía."
       people_tagged_with: "Perfiles con %{tag}"
       posts_tagged_with: "Publicaciones con #%{tag}"
       stop_following: "Dejar de seguir #%{tag}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 16a7750156715afb25340629b77d6c1333b2d4cd..69a49b42a4f43ffd35d2d85c664f8668d8db1f5b 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -750,6 +750,7 @@ eu:
         hello: "Kaixo guztioi, #%{new_user_tag} naiz. "
         i_like: "%{tags} interesatzen zait."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: Partekatzen...
       publishing_to: "hemen partekatzen:"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 61165dd43dbfd1e01152740a53d10f95bfe78346..31e96e552e438e10b7e654d9364c264308503c3e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -601,12 +601,12 @@ fi:
       updated: "Profiili päivitetty"
   public: "Julkinen"
   reactions:
-    few: "%{count} reactions"
-    many: "%{count} reactions"
-    one: "1 reaction"
-    other: "%{count} reactions"
-    two: "%{count} reactions"
-    zero: "0 reactions"
+    few: "%{count} reaktiota"
+    many: "%{count} reaktiota"
+    one: "1 reaktio"
+    other: "%{count} reaktiota"
+    two: "%{count} reaktiota"
+    zero: "0 reaktiota"
   registrations:
     closed: "Rekisteröityminen on suljettu tässä Diaspora-podissa."
     create:
@@ -750,6 +750,7 @@ fi:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: Lähetetään...
       publishing_to: "Julkaistaan: "
@@ -892,17 +893,20 @@ fi:
       your_email: "Sähköpostiosoitteesi"
       your_handle: Diaspora-tunnuksesi
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
-      community_welcome: "Diaspora's community is happy to have you aboard!"
+      awesome_take_me_to_diaspora: "Loistavaa! Mennään Diasporaan"
+      community_welcome: "Diaspora-yhteisö on iloinen saadessaan sinut mukaan!"
       hashtag_explanation: "Hashtagit mahdollistavat kiinnostuksen kohteistasi keskustelun ja niiden seuraamisen. Ne ovat myös hyvä keino ihmisten löytämiseen Diasporassa."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
-      what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      hashtag_suggestions: "Voit seurata vaikkapa tageja kuten #taide, #elokuvat, #gif jne."
+      hooking_up_fb: "yhdistämällä Facebook-tilisi"
+      saved: Tallennettu!
+      we_can_speed_things_up: "Voimme nopeuttaa asioita hieman"
+      well_hello_there: "No, mutta hei!"
+      what_are_you_in_to: "Mistä olet kiinnostunut?"
+      what_facebook_does: |-
+          Diasporaan. Nimesi ja kuvasi haetaan Diasporaan, ja tämän jälkeen voit myös lähettää viestejä Diasporasta Facebookiin.
+
+          This will pull your name and photo, and enable cross-positng.
+      who_are_you: "Kuka olet?"
     logged_out:
       go_mobile: "Siirry nyt mobiiliin."
       on_your_mobile_device: "mobiililaitteellasi päästäksesi Diasporan mobiilisivustolle."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 7f008438a0ab8b035e104fb79eee29d6a353bcac..3704a46ab3698b1ddaf86bff3fbf009ab3a68c12 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -259,7 +259,7 @@ fr:
       birthday_with_year: "%d %B %Y"
       fullmonth_day: "%d %B"
   delete: "Supprimer"
-  email: E-mail
+  email: "Courriel"
   error_messages:
     helper:
       correct_the_following_errors_and_try_again: "Corrigez les erreurs suivantes, puis réessayez."
@@ -455,8 +455,8 @@ fr:
     comment_on_post:
       reply: "Répondre ou voir le message de %{name} >"
     confirm_email:
-      click_link: "Pour activer votre nouvelle adresse email %{unconfirmed_email}, merci de suivre ce lien :"
-      subject: "Merci d'activer votre nouvelle adresse email %{unconfirmed_email}"
+      click_link: "Pour activer votre nouvelle adresse électronique %{unconfirmed_email}, merci de suivre ce lien :"
+      subject: "Merci d'activer votre nouvelle adresse électronique %{unconfirmed_email}"
     email_sent_by_diaspora: "Ce courriel a été envoyé par Diaspora. Si vous souhaitez cesser de recevoir des courriels de ce genre,"
     hello: "Bonjour %{name} !"
     liked:
@@ -750,6 +750,7 @@ fr:
         hello: "Bonjour tout le monde, je suis #%{new_user_tag}. "
         i_like: "Je suis intéressé par %{tags}."
         invited_by: "Merci pour l'invitation, "
+        newhere: "NouveauIci"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: Publication…
       publishing_to: "publication vers : "
@@ -857,8 +858,8 @@ fr:
   username: "Nom d'utilisateur"
   users:
     confirm_email:
-      email_confirmed: "Courriel %{email} activé"
-      email_not_confirmed: "L'email n'a pas pu être activé. Lien erroné ?"
+      email_confirmed: "Adresse électronique %{email} activé"
+      email_not_confirmed: "L'adresse électronique n'a pas pu être activé. Lien erroné ?"
     destroy:
       no_password: "Veuillez introduire votre mot de passe actuel pour fermer votre compte."
       success: "Votre compte a été bloqué. 20 minutes pourraient être nécessaires pour la finalisation de sa fermeture. Merci d'avoir essayé d'utiliser Diaspora."
@@ -866,7 +867,7 @@ fr:
     edit:
       also_commented: "…quelqu'un d'autre commente une publication de votre contact ?"
       change: "Modifier"
-      change_email: "Changer d'email"
+      change_email: "Changer d'adresse électronique"
       change_language: "Changer la langue"
       change_password: "Changer le mot de passe"
       close_account: "Clôturer le compte"
@@ -923,8 +924,8 @@ fr:
       password_not_changed: "Échec de la mise à jour du mot de passe"
       settings_not_updated: "La mise à jour des paramètre a échouée"
       settings_updated: "Mise à jour des paramètres"
-      unconfirmed_email_changed: "Email changé. Nécessite l'activation."
-      unconfirmed_email_not_changed: "Le changement de courriel a échoué"
+      unconfirmed_email_changed: "Adresse électronique changée. Nécessite l'activation."
+      unconfirmed_email_not_changed: "Le changement d'adresse électronique a échoué"
   webfinger:
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
     hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de %{account}"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 0ccaece7f0bbbce6326ca7212a4dc6449c94cd36..984cf8107d72670f59d98267922001c5ad583cfe 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -750,6 +750,7 @@ ga:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: Póstáil...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 4c2a15bfcc72d87271fa08cf1af45b62fc56fedf..c3016c017f668daa10d8df7a541509cba1ee56ee 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -750,6 +750,7 @@ he:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: פרסום...
       publishing_to: "פרסום אל:"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 398b14dd3fba4b1a35a43647bf0dc31eb2185086..70a9d62db47a883997924bb9b02860c3b23ed11a 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -752,6 +752,7 @@ hu:
         hello: "Sziasztok, én #%{new_user_tag} vagyok. "
         i_like: "Engem ezek érdekelnek: %{tags}."
         invited_by: "Köszi a meghívásért,"
+        newhere: "NewHere"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: Küldés...
       publishing_to: "Publikálás:"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 179fcabbaaacd9d192b53747e471ccabf84a15fa..f693729fb9b59f951180d99b706664651a53f2d6 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -750,6 +750,7 @@ id:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 468f2be45281ce374469fbe6e670d796d1749df7..bff6359fae5e0bc73f1a54aba2053c2a2752b300 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -750,6 +750,7 @@ is:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: Senda...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 7fc9036affb5ba03b298171b204d3069ac029a85..74a2c22d703747879fd86fee0387059d2b6a253d 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -747,9 +747,10 @@ it:
       discard_post: "Elimina il post"
       make_public: "rendi pubblico"
       new_user_prefill:
-        hello: "Ciao a tutti, eccomi qui! Hey everyone, I'm #%{new_user_tag}"
+        hello: "Ciao a tutti, sono un #%{new_user_tag}."
         i_like: "I miei interessi sono %{tags}."
         invited_by: "Grazie per l'invito, "
+        newhere: "NuovoUtente"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
       publishing_to: "stai condividendo con: "
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index ee520cfaccb41ae4e28c38ac026271e096d62c96..88de43b3a99a55e6d180b3df763a3bf10abb12ca 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -750,6 +750,7 @@ ja:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "%{aspect}に投稿する"
       posting: "投稿中"
       publishing_to: 公開先：
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index a922d4e535388f0af40c192a393a35dc5d1669d2..0b072c5295c28fc5bd64622900445ec4ac2ae6c2 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -111,9 +111,9 @@ ko:
         here_to_help: "디아스포라 커뮤니티가 도와드립니다!"
         need_help: "도움이 필요하세요?"
         satisfaction: "%{link}: 커뮤니티 지원"
-        tag_bug: "bug"
-        tag_feature: "feature"
-        tag_question: "question"
+        tag_bug: "버그"
+        tag_feature: "기능"
+        tag_question: "질문"
         tutorials_wiki_and_forum: "%{tutorial}과 %{wiki}와  %{forum}: 커뮤니티가 운영하는 튜토리얼, 사용 방법과 소식"
       introduce_yourself: "내 스트림에서 스스로를 나타내십시오."
       keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
@@ -494,7 +494,7 @@ ko:
       results_for: "%{params} ê²°ê³¼"
     index:
       couldnt_find_them_send_invite: "못 찾았나요? 초대장을 보내세요!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "%{tag_link} 태그가 달린 공유물을 찾고있나요?"
       no_one_found: "검색 결과가 없습니다"
       no_results: "검색 결과가 없습니다"
       results_for: "검색 결과:"
@@ -747,9 +747,10 @@ ko:
       discard_post: "공유물 삭제"
       make_public: "공개하기"
       new_user_prefill:
-        hello: "반갑습니다! 새로 가입했습니다. #%{new_user_tag}!"
+        hello: "반갑습니다! #%{new_user_tag}했습니다."
         i_like: "제 관심사는 %{tags} 입니다."
         invited_by: "초대해주셔서 고맙습니다,"
+        newhere: "새로가입"
       post_a_message_to: "%{aspect}에 공유물 올리기"
       posting: "올리는 중···"
       publishing_to: "올릴 곳: "
@@ -790,12 +791,12 @@ ko:
   stream_helper:
     hide_comments: "댓글 감추기"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "댓글 %{count}개 더 보기"
+      many: "댓글 %{count}개 더 보기"
+      one: "댓글 한 개 더 보기"
+      other: "댓글 %{count}개 더 보기"
+      two: "댓글 두 개 더 보기"
+      zero: "댓글이 더 없습니다"
   streams:
     aspects:
       title: "내 애스펙"
@@ -822,7 +823,7 @@ ko:
     recently: "최근에"
     tags:
       contacts_title: "People who dig this tag"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "%{tag_name} 태그를 달고 공유하세요!"
       title: "태그: %{tags}"
   tag_followings:
     create:
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index fc2d90bf213ecb851b213117a11abec8a7b661fb..9f2baa5607fd4e4f223f48f8200410ec1753d1a8 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -750,6 +750,7 @@ lt:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: Rašoma...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 4e13d9ed6f4e1809de7eb82fda0150468562164e..1767c25cb833a8f26b1fa466222d03a1c7a4f5fc 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -750,6 +750,7 @@ mk:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Додај порака во %{aspect}"
       posting: Објавување...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index b9bea2b2048ffa5f8ef6cd5d2332f9889f6259e4..d2ec3bbfe6b7f2e0454f183f286c00cb288f61ca 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -750,6 +750,7 @@ nb:
         hello: "Hei alle sammen, jeg er #%{new_user_tag}. "
         i_like: "Jeg er interessert i %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: Poster...
       publishing_to: "publiserer til:"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index fa31731d0e383756892f52d49e8d8325cee89c38..112250fd9ee9fbd7f5438111fa900b91782ed052 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -750,6 +750,7 @@ nl:
         hello: "Hallo iedereen, ik ben #%{new_user_tag}. "
         i_like: "Ik ben geïnteresseerd in %{tags}."
         invited_by: "Bedankt voor de invite,"
+        newhere: "NieuwHier"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: Plaatsen...
       publishing_to: "delen met: "
diff --git a/config/locales/diaspora/nn.yml b/config/locales/diaspora/nn.yml
index 6aca4f145e8f4423318d28552775684f81f32ea2..eb2eae84548c3a009f7f7caad733bfc7088fd77e 100644
--- a/config/locales/diaspora/nn.yml
+++ b/config/locales/diaspora/nn.yml
@@ -750,6 +750,7 @@ nn:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Send ei melding til %{aspect}"
       posting: "Sender …"
       publishing_to: "publiserer til:"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 17dc0591933fbe0b524dcfbd870dcbcb0a750a23..4a15be49dd78c224d7581877fd0f2e4e3bc2e44e 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -750,6 +750,7 @@ pa:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 14e202c78a3102b847da7f88eb6d78090396f004..fce07ad75c87739a6889b8c6a268cd17c8f9244c 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -494,7 +494,7 @@ pl:
       results_for: "wyniki dla %{params}"
     index:
       couldnt_find_them_send_invite: "Nie możesz ich znaleźć? Wyślij zaproszenie!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Szukasz wpisów oznaczonych %{tag_link}?"
       no_one_found: "...i nikogo nie odnaleziono."
       no_results: "Hej! Musisz coś wpisać w pole wyszukiwarki!"
       results_for: "wyniki wyszukiwania dla"
@@ -750,6 +750,7 @@ pl:
         hello: "Witajcie wszyscy, jestem #%{new_user_tag}. "
         i_like: "InteresujÄ… mnie %{tags}."
         invited_by: "Dzięki za zaproszenie,"
+        newhere: "NowiTutaj"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: Publikowanie...
       publishing_to: "publikuj na:"
@@ -790,12 +791,12 @@ pl:
   stream_helper:
     hide_comments: "Ukryj wszystkie komentarze"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Wyświetl %{count} więcej komentarzy"
+      many: "Wyświetl %{count} więcej komentarzy"
+      one: "Wyświetl jeden komentarz więcej"
+      other: "Wyświetl %{count} więcej komentarzy"
+      two: "Wyświetl dwa komentarze więcej"
+      zero: "Nie ma więcej komentarzy"
   streams:
     aspects:
       title: "Twoje Aspekty"
@@ -822,7 +823,7 @@ pl:
     recently: "ostatnio:"
     tags:
       contacts_title: "Osoby, które wykopały te tagi"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Rzecz o %{tag_link} jest..."
       title: "Oznaczone wpisy: %{tags}"
   tag_followings:
     create:
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index d20a20031f7956ecd8e41a8e15a9bb25877f1086..00937de49d52260be6a3fbc90b49091306887f6c 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -750,6 +750,7 @@ pt-BR:
         hello: "Olá a todos, sou #%{new_user_tag}. "
         i_like: "Estou interessado em %{tags}."
         invited_by: "Obrigado pelo convite, "
+        newhere: "NewHere"
       post_a_message_to: "Postar uma mensagem para %{aspect}"
       posting: Postando...
       publishing_to: "publicando para:"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index ef857e37f8ed89b7fdd4310876e306c8619877d4..9b0d435d6df5fba251046f658dd4da95559389c7 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -750,6 +750,7 @@ pt-PT:
         hello: "Olá a todos, o meu nome é #%{new_user_tag}. "
         i_like: "Estou interessado em %{tags}."
         invited_by: "Obrigado(a) pelo convite,"
+        newhere: "NewHere"
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
       publishing_to: "publicando para:"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 30f01275ec16d2945546bee4dbc888f58d406565..f1fd00472a274f8e71e50ec28e675575fddfbf92 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -750,6 +750,7 @@ ro:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Publicare...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 3615183b124c29c84f853676754ac9e8d2757f42..a7162ac6b04a209ddd45fd2a69e66908cdcd2f9f 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -68,7 +68,7 @@ ru:
       stay_updated: "Будьте в курсе"
       stay_updated_explanation: "Ваш основной поток наполняется вашими контактами, метками, за которыми вы следите и записями нескольких популярных членов сообщества."
     contacts_not_visible: "Контакты в этом аспекте не смогут видеть друг друга."
-    contacts_visible: "Контакты в этом аспекте могут видеть друг друга"
+    contacts_visible: "Контакты в этом аспекте могут видеть друг друга."
     create:
       failure: "Не удалось создать аспект."
       success: "Ваш новый аспект %{name} создан"
@@ -265,11 +265,11 @@ ru:
       correct_the_following_errors_and_try_again: "Исправьте ошибки и попробуйте снова."
       invalid_fields: "Недействительные поля"
   fill_me_out: "Заполнить"
-  find_people: "Поиск людей или меток"
+  find_people: "Поиск людей или #меток"
   hide: "Скрыть"
   home:
     show:
-      already_account: "уже есть учётная запись?"
+      already_account: "уже есть аккаунт?"
       choice: "Выбор"
       choice_explanation: "Диаспора позволяет сортировать группы контактов, называемые аспектами. Аспекты - уникальная особенность диаспоры. Они позволяют обеспечить приватность ваших фотографий, историй и т.д. Последние будут доступны только для тех людей, которые принадлежат соответствующему аспекту."
       learn_about_host: "Узнайте о том, как организовать свой собственный сервер Диаспоры."
@@ -290,7 +290,7 @@ ru:
       already_sent: "Вы уже пригласили этого человека."
       no_more: "У вас закончились приглашения."
       own_address: "Вы не можете отправить приглашение на ваш собственный адрес."
-      rejected: "Следующие адреса электронной почты имеют проблемы:"
+      rejected: "Есть проблемы со следующими адресами электронной почты:"
       sent: "Ваши приглашения отправлены:"
     edit:
       accept_your_invitation: "Принять ваше приглашение"
@@ -310,7 +310,7 @@ ru:
   layouts:
     application:
       powered_by: "ПОДДЕРЖИВАЕТСЯ ДИАСПОРОЙ*"
-      public_feed: "Общественный канал диаспоры для %{name}"
+      public_feed: "Общественный канал Диаспоры для %{name}"
       toggle: обычный/мобильный
       whats_new: "что нового?"
       your_aspects: "Ваши аспекты"
@@ -361,7 +361,7 @@ ru:
       zero: "%{actors} также прокомментировали %{post_link} %{post_author}."
     also_commented_deleted:
       few: "%{actors} комментировали ваше удаленное сообщение."
-      many: "%{actors} комментировали ваше удаленое сообщение."
+      many: "%{actors} комментировали ваше удаленное сообщение."
       one: "%{actors} комментировал(а) ваше удаленное сообщение."
       other: "%{actors} комментировали ваше удаленное сообщение."
       two: "%{actors} комментировали удаленое сообщение."
@@ -400,12 +400,12 @@ ru:
       two: "%{actors} понравилась ваша %{post_link}."
       zero: "%{actors} понравилась ваша %{post_link}."
     liked_post_deleted:
-      few: "%{actors} нравилась ваша удаленая запись."
-      many: "%{actors} нравилась ваша удаленая запись."
-      one: "%{actors} нравилась ваша удаленая запись."
-      other: "%{actors} нравилась ваша удаленая запись."
+      few: "%{actors} нравилась ваша удаленная запись."
+      many: "%{actors} нравилась ваша удаленная запись."
+      one: "%{actors} нравилась ваша удаленная запись."
+      other: "%{actors} нравилась ваша удаленная запись."
       two: "%{actors} нравилась ваша удаленная запись."
-      zero: "%{actors} нравилась ваша удаленая запись."
+      zero: "%{actors} нравилась ваша удаленная запись."
     mentioned:
       few: "%{actors} упомянули вас в %{post_link}."
       many: "%{actors} упомянули вас в %{post_link}."
@@ -464,7 +464,7 @@ ru:
       view_post: "Посмотреть запись >"
     mentioned:
       mentioned: "упомянул вас в сообщении:"
-      subject: "%{name} упомянул вас в диаспоре*"
+      subject: "%{name} упомянул вас в Диаспоре*"
     private_message:
       reply_to_or_view: "Ответить или посмотреть эту беседу >"
     reshared:
@@ -494,7 +494,7 @@ ru:
       results_for: "результаты для %{params}"
     index:
       couldnt_find_them_send_invite: "Не можете их найти? Отправьте им приглашение!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Сообщения, отмеченные как %{tag_link}?"
       no_one_found: "...не удалось никого найти."
       no_results: "Введите текст для поиска."
       results_for: "результаты поиска для"
@@ -576,7 +576,7 @@ ru:
       destroy: "Удалить"
       not_found: "Извините, мы не смогли найти эту запись."
       permalink: "постоянная ссылка"
-  previous: "предыдущая"
+  previous: "ранее"
   privacy: "Приватность"
   profile: "Профиль"
   profiles:
@@ -608,7 +608,7 @@ ru:
     two: "Отзывы: %{count}"
     zero: "Отзывы: 0"
   registrations:
-    closed: "В этой части Диаспоры регистрация закрыта"
+    closed: "На этом сервере Диаспоры регистрация закрыта."
     create:
       success: "Добро пожаловать в Диаспору!"
     edit:
@@ -636,10 +636,10 @@ ru:
       success: "Теперь вы друзья."
     helper:
       new_requests:
-        few: "%{count} новые[-х] заявки[-ок]!"
-        many: "%{count} новые[-х] заявки[-ок]!"
+        few: "Новых запросов - %{count}!"
+        many: "Новых запросов - %{count}!"
         one: "новый запрос!"
-        other: "%{count} новые[-х] заявки[-ок]!"
+        other: "Новых запросов - %{count}!"
         two: "%{count} новых запросов!"
         zero: "новых запросов нет"
     manage_aspect_contacts:
@@ -705,7 +705,7 @@ ru:
       create_request: "Поиск по идентификатору в Диаспоре"
       diaspora_handle: diaspora@pod.org
       enter_a_diaspora_username: "Введите имя пользователя Диаспоры:"
-      know_email: "Знаете их email адреса? Вы должны предложить им присоединится к Диаспоре "
+      know_email: "Знаете их email адреса? Вы можете предложить им присоединиться к Диаспоре "
       your_diaspora_username_is: "Ваше имя пользователя Диаспоры: %{diaspora_handle}"
     aspect_dropdown:
       add_to_aspect: "Добавить контакт"
@@ -729,7 +729,7 @@ ru:
       invite_someone: "Пригласить кого-нибудь"
       invite_your_friends: "Пригласить друзей"
       invites: "Приглашения"
-      invites_closed: "В данный момент возможность приглашений закрыта в этой части Диаспоры"
+      invites_closed: "В данный момент возможность приглашений закрыта на этом сервере Диаспоры"
     notification:
       new: "Новый %{type} из %{from}"
     public_explain:
@@ -750,6 +750,7 @@ ru:
         hello: "Всем привет, я #%{new_user_tag}."
         i_like: "Мне интересны метки %{tags}."
         invited_by: "Спасибо за приглашение, "
+        newhere: "Новичок"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: Отправка...
       publishing_to: "публикация в:"
@@ -770,7 +771,7 @@ ru:
       shared_with: "Для аспектов: %{aspect_names}"
       unlike: "Не нравится"
       via: "через %{link}"
-      viewable_to_anyone: "Эту запись может видеть любой в Интернете"
+      viewable_to_anyone: "Эту запись может видеть любой в интернете"
   status_messages:
     create:
       success: "Успешно упомянут: %{names}"
@@ -790,12 +791,12 @@ ru:
   stream_helper:
     hide_comments: "Скрыть все комментарии"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Показать еще %{count} комментариев"
+      many: "Показать еще %{count} комментариев"
+      one: "Показать еще комментарии"
+      other: "Показать еще %{count} комментариев"
+      two: "Показать еще два комментария"
+      zero: "Больше нет комментариев"
   streams:
     aspects:
       title: "Аспекты"
@@ -844,11 +845,11 @@ ru:
     show:
       connect_to_cubbies: "Подключение к Cubbi.es"
       connecting_is_simple: "Подключить аккаунт Диаспоры легко! Просто введите ваш идентификатор в Диаспоре (<b>%{diaspora_id}</b>) на <a href='%{href_link}'>странице настроек</a> cubbies и нажмите \"подключить\"."
-      daniels_account: "Диаспора-аккаунт Даниила"
+      daniels_account: "Аккаунт Даниила в Диаспоре"
       log_in_with_diaspora_is_comming: "Очень скоро вы сможете подключаться к новым приложениям без необходимости заводить новую учетную запись вне Диаспоры."
       love_to_try: "Мы будем рады, если вы попробуете это."
       making_the_connection: "Создание подключения"
-      screenshot_explanation: "%{link1}.  Это особенно связано с %{link2}."
+      screenshot_explanation: "%{link1}.  Этот аккаунт cubbi связан с %{link2}."
       sign_up_today: "Зарегистрируйтесь прямо сейчас!"
       typical_userpage: "Типичная cubbi.es страница"
       via: "(via %{link})"
@@ -928,7 +929,7 @@ ru:
   webfinger:
     fetch_failed: "Не удалось получить профиль для %{profile_url}"
     hcard_fetch_failed: "Возникла проблема при получении hcard для %{account}"
-    no_person_constructed: "Ни одно лицо не может быть собрано из этой hcard."
-    not_enabled: "webfinger не будет включен для хоста %{account}'s"
+    no_person_constructed: "Ни одна персона не может быть собрана из этой hcard."
+    not_enabled: "webfinger не будет включен для хоста %{account}"
     xrd_fetch_failed: "Произошла ошибка при получении xrd с %{account}"
   welcome: "Добро пожаловать!"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 9de83b3822ded9ee9e22c24fda61402ec87d746d..97426d6a59c09fd2ff093baa27afd9534db82ec5 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -29,7 +29,7 @@ sk:
         reshare:
           attributes:
             root_guid:
-              taken: "O tento príspevok ste sa už znova podelili!"
+              taken: "To je dobré, čo? Tento príspevok ste sa už raz znova zdieľali!"
         user:
           attributes:
             email:
@@ -106,21 +106,21 @@ sk:
         do_you: "Už:"
         email_feedback: "Napíšte nám svoj názor na %{link}, ak uprednostňujete tento spôsob"
         feature_suggestion: "&ndash; máte nápad na novú funkciu %{link}?"
-        find_a_bug: "&ndash; ste našli chybu %{link}?"
-        have_a_question: "&ndash; máte otázku %{link}?"
+        find_a_bug: "&ndash; ste našli %{link}?"
+        have_a_question: "&ndash; máte %{link}?"
         here_to_help: "Komunita Diaspory je tu!"
         need_help: "Potrebujete pomoc?"
         satisfaction: "%{link}: podpora od ostatných používateľov"
-        tag_bug: "#bug"
-        tag_feature: "#feature"
-        tag_question: "#question"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
+        tag_bug: "chybu"
+        tag_feature: "funkciu"
+        tag_question: "otázku"
+        tutorials_wiki_and_forum: "%{tutorial}, %{wiki} a %{forum}: príručky, ktoré vytvorili členovia komunity, návody a novinky"
       introduce_yourself: "Toto je vaša nástenka.  Poďte sa predstaviť."
       keep_us_running: "Na udržanie %{pod} v dobrej kondícii kúpte svojím príspevkom našim serverom ich mesačnú dávku kávy vo forme opráv!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Sledujte %{link} a privítajte nových používateľov na Diaspore*!"
+        learn_more: "Zistiť viac"
+        title: "Privítajte nových používateľov"
       no_contacts: "Žiadne kontakty"
       no_tags: "+ Nájdite štítok, ktorý budete sledovať"
       people_sharing_with_you: "Ľudia, s ktorými ste sa s niečim podelili"
@@ -129,7 +129,7 @@ sk:
         content: "S Diasporou môžete prepojiť tieto služby:"
         heading: "Pripojiť sa k službám"
       unfollow_tag: "Prestať sledovať #%{tag}"
-      welcome_to_diaspora: "Vitaj na Diaspore, %{name}!"
+      welcome_to_diaspora: "Vitajte na Diaspore, %{name}!"
       your_aspects: "Vaše kategórie"
     many: "%{count} kategórií"
     move_contact:
@@ -172,11 +172,11 @@ sk:
   back: "Späť"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Tohto používateľa nemôžete ignorovať.  #evasion"
+      success: "V poriadku, tohto používateľa na svojej nástenke znova neuvidíte. #silencio!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Ignorovanie tohto používateľa sa nepodarilo zrušiť.  #evasion"
+      success: "Pozrime sa, čo hovoria! #sayhello"
   bookmarklet:
     explanation: "Píšte na Diasporu z hocikiaľ tak, že si pridáte do záložiek odkaz %{link}."
     explanation_link_text: "tento odkaz"
@@ -301,7 +301,7 @@ sk:
       comma_seperated_plz: "Môžete vložiť viacero adries; oddeľte ich čiarkou."
       if_they_accept_info: "Po odsúhlasení budú pozvaní používatelia pridaní do príslušnej kategórie."
       invite_someone_to_join: "Pozvite niekoho na Diasporu*!"
-      language: "Language"
+      language: "Jazyk"
       personal_message: "Súkromná správa"
       resend: "Preposlať"
       send_an_invitation: "Poslať pozvánku"
@@ -494,7 +494,7 @@ sk:
       results_for: "výsledky pre %{params}"
     index:
       couldnt_find_them_send_invite: "Nenašli ste ich? Pozvite ich!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Hľadajú sa príspevky označené %{tag_link}?"
       no_one_found: "...a nikto sa nenašiel."
       no_results: "Hej! Musíte niečo vyhľadať."
       results_for: "Výsledky vyhľadávania pre"
@@ -518,7 +518,7 @@ sk:
     show:
       does_not_exist: "Osoba neexistuje!"
       has_not_shared_with_you_yet: "%{name} sa s vami ešte nepodelil(a) o žiadne príspevky!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Ignorujete všetky príspevky, ktoré vytvoril(a) %{name}."
       incoming_request: "%{name} sa s vami chce o niečo podeliť"
       mention: "Zmienka"
       message: "Správa"
@@ -556,7 +556,7 @@ sk:
       invalid_ext: "{file} má neplatnú príponu. Povolené sú len prípony {extensions}."
       size_error: "{file} je príliš veľký, maximálna povolená veľkosť je {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "alebo vyberte jednu z fotiek, ktoré už existujú %{photos} "
       upload: "Nahrať novú profilovú fotku!"
     photo:
       view_all: "zobraziť všetky fotky použ. %{name}"
@@ -577,7 +577,7 @@ sk:
       not_found: "Prepáčte, tento príspevok sa nepodarilo nájsť."
       permalink: "trvalý odkaz"
   previous: "Predchádzajúce"
-  privacy: "Privacy"
+  privacy: "Ochrana súkromia"
   profile: "Profil"
   profiles:
     edit:
@@ -625,7 +625,7 @@ sk:
       enter_password_again: "Zadajte rovnaké heslo ako predtým"
       enter_username: "Zadajte používateľské meno (iba písmená, číslice a podčiarkovníky)"
       join_the_movement: "Pripojte sa k hnutiu!"
-      sign_up_message: "Prepojenie cez sociálne siete s < 3"
+      sign_up_message: "Prepojenie cez sociálne siete s ♥"
   requests:
     create:
       sending: "Posiela sa..."
@@ -675,7 +675,7 @@ sk:
     failure:
       error: "pri pripájaní k službe nastala chyba"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora pridáva údaje o vašich priateľoch zo siete %{service}, prosím, vráťte sa sem o niekoľko minút."
       no_friends: "Žiadni priatelia z Facebooku sa nenašli."
       service_friends: "Priatelia zo siete %{service}"
     index:
@@ -697,8 +697,8 @@ sk:
   settings: "Nastavenia"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "Príspevok, ktorý vytvoril(a) %{name} ste schovali a posielanie oznamov bolo zastavené."
+      see_it_on_their_profile: "Ak si chcete prečítať novšie verzie tohto príspevku, navštívte stránku s profilom použ. %{name}."
   shared:
     add_contact:
       add_new_contact: "Pridať nový kontakt"
@@ -731,12 +731,12 @@ sk:
       invites: "Pozvánky"
       invites_closed: "Pozývanie je na tomto pode Diaspory momentálne pozastavené"
     notification:
-      new: "Nový %{type} od %{from}"
+      new: "Nový %{type} od použ. %{from}"
     public_explain:
       control_your_audience: "Kontrolovať publikum"
       logged_in: "Prihlásenie na %{service}"
-      manage: "Spravovať pripojené služby"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      manage: "Spravovať prepojené služby"
+      new_user_welcome_message: "Na roztriedenie svojich príspevkov a hľadanie ľudí, ktorí majú rovnaké koníčky, používajte #hashtagy.  Nájdite super ľudí pomocou @Mentions"
       outside: "Verejnú správu môžu vidieť aj používatelia mimo Diaspory."
       share: "Zdieľať"
       title: "Nastaviť pripojené služby"
@@ -747,9 +747,10 @@ sk:
       discard_post: "Vymazať príspevok"
       make_public: "Zverejniť"
       new_user_prefill:
-        hello: "Hej, všetci, Som #%{new_user_tag}. "
+        hello: "Hej, všetci, som #%{new_user_tag}. "
         i_like: "Zaujíma ma %{tags}."
-        invited_by: "Thanks for the invite, "
+        invited_by: "Vďaka za pozvanie, "
+        newhere: "NewHere"
       post_a_message_to: "Poslať správu na %{aspect}"
       posting: "Posiela sa..."
       publishing_to: "Publikuje sa na: "
@@ -760,12 +761,12 @@ sk:
     reshare:
       reshare: "Znovu sa podeliť"
     stream_element:
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "Pripojte sa k tomuto používateľovi a okomentujte jeho príspevok"
+      currently_unavailable: "momentálne sa nedajú písať komentáre"
       dislike: "Nepáči sa mi to"
-      hide_and_mute: "Schovať a vypnúť"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      hide_and_mute: "Schovať príspevok a vypnúť oznamy"
+      ignore_user: "Ignorovať použ. %{name}"
+      ignore_user_description: "Ignorovať použ. a odstrániť ho (ju) zo všetkých kategórií?"
       like: "Páči sa mi to"
       shared_with: "Zdieľa sa s kategóriami: %{aspect_names}"
       unlike: "Odznačiť"
@@ -790,24 +791,24 @@ sk:
   stream_helper:
     hide_comments: "skryť komentáre"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Zobraziť ďalších %{count} komentárov"
+      many: "Zobraziť ďalších %{count} komentárov"
+      one: "Zobraziť ešte jeden komentár"
+      other: "Zobraziť ďalšie %{count} komentáre"
+      two: "Zobraziť ďalšie dva komentáre"
+      zero: "Žiadne ďalšie komentáre nie sú"
   streams:
     aspects:
       title: "Vaše kategórie"
     aspects_stream: "Kategórie"
-    commented_on: "komentované"
+    commented_on: "okomentované"
     community_spotlight_stream: "V centre pozornosti komunity"
     followed_tag:
-      add_a_tag: "Add a tag"
-      contacts_title: "Ľudia, ktorí sledujú tieto štítky"
-      follow: "Follow"
+      add_a_tag: "Pridať značku"
+      contacts_title: "Ľudia, ktorí sledujú tieto značky"
+      follow: "Sledovať"
       title: "#Sledované štítky"
-    followed_tags_stream: "#Sledované štítky"
+    followed_tags_stream: "#Značky, ktoré sledujete"
     mentioned_stream: "@Zmienky"
     mentions:
       contacts_title: "Ľudia, ktorí vás spomenuli"
@@ -823,14 +824,14 @@ sk:
     tags:
       contacts_title: "Ľudia, ktorí hľadajú tieto štítky"
       tag_prefill_text: "The thing about %{tag_name} is... "
-      title: "Príspevky so štítkami: %{tags}"
+      title: "Príspevky so značkami: %{tags}"
   tag_followings:
     create:
-      failure: "Nedá sa sledovať: #%{name}"
-      success: "Úspešne sledujete: #%{name}"
+      failure: "Nedá sa sledovať použ. #%{name}. Nesledujte ho (ju) už?"
+      success: "Hurá! Teraz sledujete použ. #%{name}."
     destroy:
-      failure: "Nepodarilo sa zrušiť sledovanie: #%{name}"
-      success: "Úspešne ste prestali sledovať: #%{name}"
+      failure: "Nepodarilo sa zrušiť sledovanie použ. #%{name}. Možno ste ho (ju) už prestali sledovať."
+      success: "No! Už viac nesledujete použ. #%{name}."
   tags:
     show:
       follow: "Sledovať #%{tag}"
@@ -860,9 +861,9 @@ sk:
       email_confirmed: "E-mail %{email} aktivovaný"
       email_not_confirmed: "E-mail sa nepodarilo aktivovať. Zlý odkaz?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Zadajte, prosím svoje súčasné heslo, aby ste mohli zrušiť svoj účet."
+      success: "Váš účet bol uzamknutý.  Dokončiť zrušenie vášho účtu nám môže trvať 20 minút.  Ďakujeme, že ste vyskúšali Diasporu."
+      wrong_password: "Zadané heslo sa nezhoduje s vaším súčasným heslom."
     edit:
       also_commented: "...niekto okomentuje aj príspevok človeka vo vašich kontaktoch?"
       change: "Zmeniť"
@@ -881,7 +882,7 @@ sk:
       liked: "...sa niekomu páči váš príspevok?"
       mentioned: "...vás spomenuli v príspevku?"
       new_password: "Nové heslo"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Momentálne sa fotky nedajú exportovať"
       private_message: "...dostanete súkromnú správu?"
       receive_email_notifications: "Poslať oznam e-mailom, ak"
       reshared: "...sa niekto znova podelí o váš príspevok?"
@@ -895,7 +896,7 @@ sk:
       awesome_take_me_to_diaspora: "Super! Prejsť na Diasporu*"
       community_welcome: "Komunita Diaspory je šťastná, že ste na jej palube!"
       hashtag_explanation: "Hashtagy vám umožňujú hovoriť o tom, čo vás zaujíma a sledovať diskusie o takýchto veciach.   Je to aj skvelý spôsob, ako nájsť nových ľudí na Diaspore."
-      hashtag_suggestions: "Skúste štítky ako napr. #art, #movies, #gif, atď."
+      hashtag_suggestions: "Skúste sledovať značky, ako napr. #art, #movies, #gif, atď."
       hooking_up_fb: "prepojíte svoj účet na Facebooku"
       saved: Uložené!
       we_can_speed_things_up: "Môžeme veci urýchliť, ak"
@@ -910,9 +911,9 @@ sk:
       simply_visit: "Jednoducho navštívte"
       works_on_modern: "Funguje na všetkých moderných smartfónoch"
     privacy_settings:
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Používatelia, ktorých ignorujete"
+      stop_ignoring: "Prestať ignorovať"
+      title: "Nastavenia ochrany súkromia"
     public:
       does_not_exist: "Používateľ %{username} neexistuje!"
     update:
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 026d14fda51c0f0518a4e24c5e66e1deadf4cd8f..28abefa7cb4cc4df9e8ed4902c2049717675a63f 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -485,7 +485,7 @@ sl:
   password_confirmation: "Potrditev gesla"
   people:
     add_contact_small:
-      add_contact_from_tag: "dodaj osebo iz zaznamka"
+      add_contact_from_tag: "dodaj osebo iz oznake"
     aspect_list:
       edit_membership: "uredi člane skupin"
     few: "%{count} osebe"
@@ -494,7 +494,7 @@ sl:
       results_for: "zadetkov za %{params}"
     index:
       couldnt_find_them_send_invite: "Jih niste našli? Pošljite povabilo!"
-      looking_for: "Iščete morda objave z zaznamkom %{tag_link}?"
+      looking_for: "Iščete morda objave z oznako %{tag_link}?"
       no_one_found: "...nikogar ni bilo mogoče najti."
       no_results: "Ja, halo! Za iskanje je potrebno vpisati pogoj."
       results_for: "rezultati iskanja za"
@@ -752,6 +752,7 @@ sl:
         hello: "Zdravo vsem. Jaz sem #%{new_user_tag}. "
         i_like: "Zanimajo me naslednje oznake %{tags}."
         invited_by: "Hvala za povabilo,"
+        newhere: "NewHere"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: Objavljam...
       publishing_to: "objavljanje do: "
@@ -808,8 +809,8 @@ sl:
       add_a_tag: "Dodaj oznako"
       contacts_title: "Ljudje, ki so izbrskali te oznake"
       follow: "Sledi"
-      title: "#Sledi zaznamkom"
-    followed_tags_stream: "#Sledene objave"
+      title: "#Sledene oznake"
+    followed_tags_stream: "#Sledene oznake"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Ljudje, ki so vas omenili"
@@ -896,7 +897,7 @@ sl:
     getting_started:
       awesome_take_me_to_diaspora: "Popelji me v Diasporo*"
       community_welcome: "Skupnost Diaspora je vesela, da vas ima na krovu!"
-      hashtag_explanation: "Zaznamki vam omogočajo, da govorite in sledite vašim interesom. So tudi dober način za iskanje novih ljudi na Diaspori."
+      hashtag_explanation: "Oznake vam omogočajo, da govorite in sledite vašim interesom. So tudi dober način za iskanje novih ljudi na Diaspori."
       hashtag_suggestions: "Poskusite lahko oznake, kot so #art, #movies, #gif in podobno."
       hooking_up_fb: "povezavo vašega Facebook računa"
       saved: Shranjeno!
diff --git a/config/locales/diaspora/sq.yml b/config/locales/diaspora/sq.yml
index b8fced04c603b241cc32bbc180ef9037bc5faea5..84e3e38babdfe049dbd8846f5c879d4c4157701d 100644
--- a/config/locales/diaspora/sq.yml
+++ b/config/locales/diaspora/sq.yml
@@ -750,6 +750,7 @@ sq:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index bb848e9682a25fe5cdd8736c16f47448e32205f9..e9f5818e6e02fa4966ce7a0294496c77ba0e4107 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -61,12 +61,12 @@ sv:
       done_editing: "dölj"
     aspect_listings:
       add_an_aspect: "+ Lägg till en aspekt"
-      deselect_all: "Deselect all"
+      deselect_all: "Avmarkera alla"
       edit_aspect: "Ändra %{name}"
-      select_all: "Select all"
+      select_all: "Markera alla"
     aspect_stream:
-      stay_updated: "Stay Updated"
-      stay_updated_explanation: "Your main stream is populated with all of your contacts, tags you follow, and posts from some creative members of the community."
+      stay_updated: "HÃ¥ll dig uppdaterad"
+      stay_updated_explanation: "Din huvudström innefattar alla dina kontakter, taggar du följer och inlägg från några kreativa medlemmar i gemenskapen."
     contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra."
     contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra."
     create:
@@ -114,13 +114,13 @@ sv:
         tag_bug: "#bug"
         tag_feature: "#feature"
         tag_question: "#question"
-        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Community-powered tutorials, how-to, and news"
-      introduce_yourself: "This is your stream.  Jump in and introduce yourself."
+        tutorials_wiki_and_forum: "%{tutorial} & %{wiki} & %{forum}: Gemenskapens handledning, guider och nyheter"
+      introduce_yourself: "Det här är din ström. Hoppa in och presentera dig själv."
       keep_us_running: "Håll farten hos %{pod} uppe och köp kaffe till servrarna genom en månadsdonation!"
       new_here:
-        follow: "Follow %{link} and welcome new users to Diaspora*!"
-        learn_more: "Learn more"
-        title: "Welcome New Users"
+        follow: "Följ %{link} och välkomna nya användare av Diaspora*!"
+        learn_more: "Läs mer"
+        title: "Välkomna Nya Användare"
       no_contacts: "Inga kontakter"
       no_tags: "+ Hitta en tag att följa"
       people_sharing_with_you: "Personer som delar med dig"
@@ -129,7 +129,7 @@ sv:
         content: "Du kan koppla ihop Diaspora med följande tjänster:"
         heading: "Ihopkopplade tjänster"
       unfollow_tag: "Sluta följa #%{tag}"
-      welcome_to_diaspora: "Welcome to Diaspora, %{name}!"
+      welcome_to_diaspora: "Välkommen till Diaspora, %{name}!"
       your_aspects: "Dina aspekter"
     many: "%{count} aspekter"
     move_contact:
@@ -140,8 +140,8 @@ sv:
       create: "Skapa"
       name: "Namn (endast synligt för dig)"
     no_contacts_message:
-      community_spotlight: "community spotlight"
-      or_spotlight: "Or you can share with %{link}"
+      community_spotlight: "gemenskapens rampljus"
+      or_spotlight: "Du kan också dela med %{link}"
       try_adding_some_more_contacts: "Du kan söka efter (längst upp) eller bjuda in (till höger) fler personer."
       you_should_add_some_more_contacts: "Du bör lägga till några fler kontakter!"
     no_posts_message:
@@ -156,7 +156,7 @@ sv:
     selected_contacts:
       manage_your_aspects: "Hantera dina aspekter."
       no_contacts: "Du har ännu inte några kontakter här."
-      view_all_community_spotlight: "See all community spotlight"
+      view_all_community_spotlight: "Se alla gemenskapens rampljus"
       view_all_contacts: "Se alla kontakter"
     show:
       edit_aspect: "ändra aspekt"
@@ -172,11 +172,11 @@ sv:
   back: "Tillbaka"
   blocks:
     create:
-      failure: "I couldn't ignore that user.  #evasion"
-      success: "Alright, you won't see that user in your stream again. #silencio!"
+      failure: "Jag kunde inte ignorera den användaren.  #evasion"
+      success: "Nåväl, du kommer inte att se den användaren i din ström igen. #silencio!"
     destroy:
-      failure: "I couldn't stop ignoring that user.  #evasion"
-      success: "Let's see what they have to say! #sayhello"
+      failure: "Jag kunde inte sluta ignorera den användaren.  #evasion"
+      success: "Låt oss se vad de har att säga! #sayhello"
   bookmarklet:
     explanation: "Bokmärk %{link} för att posta på Diaspora ifrån varsomhelst. "
     explanation_link_text: "denna länk"
@@ -217,7 +217,7 @@ sv:
     sharing:
       people_sharing: "Personer delar med dig:"
     spotlight:
-      community_spotlight: "Community Spotlight"
+      community_spotlight: "Gemenskapens Rampljus"
     two: "%{count} kontakter"
     zero: "kontakter"
   conversations:
@@ -301,7 +301,7 @@ sv:
       comma_seperated_plz: "Du kan ange flera e-postadresser separerade av kommatecken."
       if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
       invite_someone_to_join: "Bjud in en vän till Diaspora!"
-      language: "Language"
+      language: "Språk"
       personal_message: "Personligt meddelande"
       resend: "Skicka igen"
       send_an_invitation: "Skicka en inbjudan"
@@ -494,7 +494,7 @@ sv:
       results_for: " resultat för %{params}"
     index:
       couldnt_find_them_send_invite: "Fanns de inte här?  Skicka en inbjudan!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "Letar du efter inlägg som taggats med %{tag_link}?"
       no_one_found: "...och ingen hittades."
       no_results: "Du måste söka efter något."
       results_for: "Sökresultat för"
@@ -518,7 +518,7 @@ sv:
     show:
       does_not_exist: "Den här personen finns inte!"
       has_not_shared_with_you_yet: "%{name} har inte delat några inlägg med dig än!"
-      ignoring: "You are ignoring all posts from %{name}."
+      ignoring: "Du ignorerar alla inlägg från %{name}."
       incoming_request: "%{name} vill dela med dig"
       mention: "Nämna"
       message: "Meddelande"
@@ -556,7 +556,7 @@ sv:
       invalid_ext: "{file} har en ogiltig filändelse. Endast {extensions} är tillåtna."
       size_error: "{file} är för stor, maximal tillåten filstorlek är {sizeLimit}."
     new_profile_photo:
-      or_select_one_existing: "or select one from your already existing %{photos}"
+      or_select_one_existing: "eller välj ett av dina tidigare %{photos}"
       upload: "Ladda upp en ny profilbild!"
     photo:
       view_all: "visa alla foton som %{name} laddat upp"
@@ -577,7 +577,7 @@ sv:
       not_found: "Tyvärr, men vi kan inte hitta det inlägget."
       permalink: "permalänk"
   previous: "föregående"
-  privacy: "Privacy"
+  privacy: "Sekretess"
   profile: "Profil"
   profiles:
     edit:
@@ -667,15 +667,15 @@ sv:
   search: "Sök"
   services:
     create:
-      already_authorized: "A user with diaspora id %{diaspora_id} already authorized that %{service_name} account."
-      failure: "Authentication failed."
+      already_authorized: "En användare med diaspora-id %{diaspora_id} har redan auktoriserat det %{service_name}-kontot."
+      failure: "Autentisering misslyckades."
       success: "Autentiering lyckades."
     destroy:
       success: "Du har nu kopplat bort tjänsten."
     failure:
       error: "Det blev ett fel vid anslutning till tjänsten"
     finder:
-      fetching_contacts: "Diaspora is populating your %{service} friends please check back in a few minutes."
+      fetching_contacts: "Diaspora fyller listan med dina %{service}-vänner. Vänligen försök igen senare."
       no_friends: "Hittade inga vänner ifrån Facebook."
       service_friends: "%{service}-vänner"
     index:
@@ -697,8 +697,8 @@ sv:
   settings: "Inställningar"
   share_visibilites:
     update:
-      post_hidden_and_muted: "%{name}'s post has been hidden, and notifications have been muted."
-      see_it_on_their_profile: "If you want to see updates on this post, visit %{name}'s profile page."
+      post_hidden_and_muted: "%{name}s inlägg har dolts och notiser har tystats."
+      see_it_on_their_profile: "Om du vill se uppdateringar för detta inlägg besöker du %{name}s profilsida."
   shared:
     add_contact:
       add_new_contact: "Lägg till en ny kontakt"
@@ -733,23 +733,24 @@ sv:
     notification:
       new: "Ny %{type} från %{from}"
     public_explain:
-      control_your_audience: "Control your Audience"
+      control_your_audience: "Bestäm din Publik"
       logged_in: "inloggad på %{service}"
       manage: "hantera anslutna tjänster"
-      new_user_welcome_message: "Use #hashtags to classify your posts and find people who share your interests.  Call out awesome people with @Mentions"
+      new_user_welcome_message: "Använd #hashtaggar för att klassificera dina inlägg och hitta folk som delar dina intressen. Ropa ut till häftiga personer med @Mentions"
       outside: "Publika meddelanden kan läsas av användare utanför Diaspora."
-      share: "Share"
+      share: "Dela"
       title: "Hantera anslutna tjänster"
-      visibility_dropdown: "Use this dropdown to change visibility of your post.  (We suggest you make this first one public.)"
+      visibility_dropdown: "Använd den här rullisten för att ändra synligheten för ditt inlägg (vi föreslår att du gör det här första inlägget publikt)."
     publisher:
       all: "alla"
       all_contacts: "alla kontakter"
       discard_post: "Släng inlägg"
       make_public: "gör publik"
       new_user_prefill:
-        hello: "Hey everyone, I'm #%{new_user_tag}. "
-        i_like: "I'm interested in %{tags}."
-        invited_by: "Thanks for the invite, "
+        hello: "Hej allihop, jag är #%{new_user_tag}. "
+        i_like: "Jag är intresserad av %{tags}."
+        invited_by: "Tack för inbjudan, "
+        newhere: "NewHere"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: Skickar...
       publishing_to: "publicerar till: "
@@ -760,12 +761,12 @@ sv:
     reshare:
       reshare: "Ã…terdela"
     stream_element:
-      connect_to_comment: "Connect to this user to comment on their post"
-      currently_unavailable: "commenting currently unavailable"
+      connect_to_comment: "Anslut till den här användaren för att kommentera på deras inlägg"
+      currently_unavailable: "kommentering är för närvarande otillgängligt"
       dislike: "Jag ogillar det här"
       hide_and_mute: "Dölj och ignorera"
-      ignore_user: "Ignore %{name}"
-      ignore_user_description: "Ignore and remove user from all aspects?"
+      ignore_user: "Ignorera %{name}"
+      ignore_user_description: "Ignorera och ta bort användaren från alla aspekter?"
       like: "Jag gillar det här"
       shared_with: "Delas med: %{aspect_names}"
       unlike: "Sluta gilla"
@@ -790,39 +791,39 @@ sv:
   stream_helper:
     hide_comments: "Dölj alla kommentarer"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "Visa %{count} ytterligare kommentarer"
+      many: "Visa %{count} ytterligare kommentarer"
+      one: "Visa en ytterligare kommentar"
+      other: "Visa %{count} ytterligare kommentarer"
+      two: "Visa två ytterligare kommentarer"
+      zero: "Inga fler kommentarer"
   streams:
     aspects:
-      title: "Your Aspects"
-    aspects_stream: "Aspects"
-    commented_on: "commented on"
-    community_spotlight_stream: "Community Spotlight"
+      title: "Dina Aspekter"
+    aspects_stream: "Aspekter"
+    commented_on: "kommenterade på"
+    community_spotlight_stream: "Gemenskapens Rampljus"
     followed_tag:
-      add_a_tag: "Add a tag"
-      contacts_title: "People who dig these tags"
-      follow: "Follow"
-      title: "#Followed Tags"
-    followed_tags_stream: "#Followed Tags"
+      add_a_tag: "Lägg till en tagg"
+      contacts_title: "Folk som gillar dessa taggar"
+      follow: "Följ"
+      title: "#Följda Taggar"
+    followed_tags_stream: "#Följda Taggar"
     mentioned_stream: "@Mentions"
     mentions:
       contacts_title: "Personer som omnämnt dig"
-      title: "Du är omnämnd"
+      title: "Omnämnanden"
     multi:
-      contacts_title: "People in your Stream"
-      title: "Stream"
-    posted: "posted"
+      contacts_title: "Folk i din Ström"
+      title: "Ström"
+    posted: "skrev ett inlägg"
     public:
       contacts_title: "Postade nyligen"
       title: "Offentlig Aktivitet"
-    recently: "recently:"
+    recently: "nyligen:"
     tags:
       contacts_title: "Människor som gillar de här taggarna"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "Det intressanta med %{tag_name} är... "
       title: "Postade taggar: %{tags}"
   tag_followings:
     create:
@@ -860,9 +861,9 @@ sv:
       email_confirmed: "E-mail %{email} aktiverad"
       email_not_confirmed: "E-mail kunde inte aktiveras. Fel länk?"
     destroy:
-      no_password: "Please enter your current password to close your account."
-      success: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
-      wrong_password: "The entered password didn't match your current password."
+      no_password: "Vänligen ange ditt nuvarande lösenord för att avsluta ditt konto."
+      success: "Ditt konto har låsts. Det har ta 20 minuter för oss att avsluta ditt konto. Tack för att du testade Diaspora."
+      wrong_password: "Det angivna lösenordet stämde inte med ditt nuvarande lösenord."
     edit:
       also_commented: "...någon har också kommenterat på din kontakts post?"
       change: "Ändra"
@@ -877,32 +878,32 @@ sv:
       edit_account: "Ändra konto"
       email_awaiting_confirmation: "Vi har skickat dig en länk till %{unconfirmed_email} för aktivering. Innan du har aktiverat din nya adress, kommer vi fortsätta att använda %{email}."
       export_data: "Exportera data"
-      getting_started: "New User Prefrences"
+      getting_started: "Inställningar för Ny Användare"
       liked: "...någon gillar ditt inlägg?"
       mentioned: "...du är omnämnd i en post?"
       new_password: "Nytt lösenord"
-      photo_export_unavailable: "Photo exporting currently unavailable"
+      photo_export_unavailable: "Export av foton är för närvarande otillgängligt"
       private_message: "...du mottar ett privat meddelande?"
       receive_email_notifications: "Skicka notiser via e-post när..."
       reshared: "...någon sprider mina inlägg vidare?"
-      show_community_spotlight: "Show Community Spotlight in Stream?"
-      show_getting_started: "Re-enable Getting Started"
+      show_community_spotlight: "Ska Gemenskapens Rampljus visas i din Ström?"
+      show_getting_started: "Återaktivera Komma Igång"
       started_sharing: "...någon börjar dela med dig?"
-      stream_preferences: "Stream Preferences"
+      stream_preferences: "Inställningar för din Ström"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora ID"
     getting_started:
-      awesome_take_me_to_diaspora: "Awesome! Take me to Diaspora*"
+      awesome_take_me_to_diaspora: "Häftigt! Ta mig till Diaspora*"
       community_welcome: "Vi i Diasporas community är glada att ha dig här!"
       hashtag_explanation: "Hashtaggar gör det möjligt att diskutera och följa dina intressen. Det är också ett bra sätt att lära känna nya människor på Diaspora."
-      hashtag_suggestions: "Try following tags like #art, #movies, #gif, etc."
-      hooking_up_fb: "hooking up your Facebook account"
-      saved: Saved!
-      we_can_speed_things_up: "We can speed things up a bit by"
-      well_hello_there: "Well, hello there!"
-      what_are_you_in_to: "What are you into?"
+      hashtag_suggestions: "Testa att följa taggar såsom #konst, #film, #gif, etc."
+      hooking_up_fb: "koppla in ditt Facebook-konto"
+      saved: Sparat!
+      we_can_speed_things_up: "Vi kan snabba upp det lite genom att"
+      well_hello_there: "Hej på dig!"
+      what_are_you_in_to: "Vad gillar du?"
       what_facebook_does: "to Diaspora. This will pull your name and photo, and enable cross-positng."
-      who_are_you: "Who are you?"
+      who_are_you: "Vem är du?"
     logged_out:
       go_mobile: "Använd nu mobilen."
       on_your_mobile_device: "i din mobil för att komma till Diaspora* mobile."
@@ -910,9 +911,9 @@ sv:
       simply_visit: "Besök helt enkelt"
       works_on_modern: "Fungerar på alla moderna smartphones"
     privacy_settings:
-      ignored_users: "Ignored Users"
-      stop_ignoring: "Stop ignoring"
-      title: "Privacy Settings"
+      ignored_users: "Ignorerade Användare"
+      stop_ignoring: "Sluta ignorera"
+      title: "Sekretessinställningar"
     public:
       does_not_exist: "Användaren %{username} finns inte!"
     update:
@@ -921,8 +922,8 @@ sv:
       language_not_changed: "Språket kunde inte ändras"
       password_changed: "Lösenordet är nu ändrat och klart att användas."
       password_not_changed: "Lösenordet kunde inte ändras"
-      settings_not_updated: "Settings update failed"
-      settings_updated: "Settings updated"
+      settings_not_updated: "Uppdatering av inställningar misslyckades"
+      settings_updated: "Inställningar uppdaterades"
       unconfirmed_email_changed: "E-postadressen har ändrats och behöver aktiveras."
       unconfirmed_email_not_changed: "Byte av e-postadress misslyckades"
   webfinger:
@@ -931,4 +932,4 @@ sv:
     no_person_constructed: "Den här personen kunde inte hittas (hcard-fel)."
     not_enabled: "Webfinger verkar inte vara påslaget på %{account}'s server"
     xrd_fetch_failed: "kunde inte hämta xrd-fil från kontot %{account}"
-  welcome: Welcome!
+  welcome: Välkommen!
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 0e8fe2f01a58d4cc8f538b4acbd66511281031f4..5428cd66a4e70208d1b24f6354657da26f747540 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -750,6 +750,7 @@ tr:
         hello: "Hey herkes, Ben #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "%{aspect} yönüne mesaj gönder "
       posting: Gönderiliyor...
       publishing_to: "buraya yayınlanıyor:"
diff --git a/config/locales/diaspora/uk.yml b/config/locales/diaspora/uk.yml
index 82ca29c306a5be2d8e61d049bf8a1fd1008fd3a5..9e797ec0d7d886291e5013b28b500440b578b983 100644
--- a/config/locales/diaspora/uk.yml
+++ b/config/locales/diaspora/uk.yml
@@ -750,6 +750,7 @@ uk:
         hello: "Привіт всім, я тут #%{new_user_tag}."
         i_like: "Я цікавлюся %{tags}."
         invited_by: "Спасибі за запрошення,"
+        newhere: "NewHere"
       post_a_message_to: "Опублікувати повідомлення для %{aspect}"
       posting: Відправка...
       publishing_to: "публікація в:"
diff --git a/config/locales/diaspora/ur-PK.yml b/config/locales/diaspora/ur-PK.yml
index b4d5ac644e836a1c3a2d5e2b2df8d25e7e758c1f..449c7ef0d388802973ad21cc8a6229ad99e1ac4f 100644
--- a/config/locales/diaspora/ur-PK.yml
+++ b/config/locales/diaspora/ur-PK.yml
@@ -750,6 +750,7 @@ ur-PK:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/vi.yml b/config/locales/diaspora/vi.yml
index 77e475aa5e67f36e9dcd7ac59af0e1d937304cf3..9f6730d9b9c4691e4bdf8b20a4b5da45c55ce654 100644
--- a/config/locales/diaspora/vi.yml
+++ b/config/locales/diaspora/vi.yml
@@ -750,6 +750,7 @@ vi:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "Post a message to %{aspect}"
       posting: Posting...
       publishing_to: "publishing to: "
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 1cddbe5604f5c5e9255a68a08ad5bf966a2f542b..06e2b711330f9dcbc4405dcd8306229c8fabe9ca 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -750,6 +750,7 @@ zh-CN:
         hello: "Hey everyone, I'm #%{new_user_tag}. "
         i_like: "I'm interested in %{tags}."
         invited_by: "Thanks for the invite, "
+        newhere: "NewHere"
       post_a_message_to: "在 %{aspect} 发布讯息"
       posting: 发布中……
       publishing_to: 发布至：
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 7fde37cfe0d43eab260380d1a63e56c91f7d686e..854839c91fcc83e9df4c64b54d6ae0632ded6545 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -66,7 +66,7 @@ zh-TW:
       select_all: "全選"
     aspect_stream:
       stay_updated: "隨時保持最新狀態"
-      stay_updated_explanation: "你的主要流水帳會充滿了你的聯絡人, 追蹤的標籤, 以及一些有創意的社群成員的貼文."
+      stay_updated_explanation: "你的主流水帳會充滿了你的聯絡人, 追蹤的標籤, 以及一些有創意的社群成員的貼文."
     contacts_not_visible: 此面向中的聯絡人無法看見彼此.
     contacts_visible: 此面向中的聯絡人可以看見彼此.
     create:
@@ -192,7 +192,7 @@ zh-TW:
       commenting: 意見發表中...
     one: "1則意見"
     other: "%{count}則意見"
-    two: "%{count}則回應"
+    two: "%{count}個意見"
     zero: "沒有意見"
   contacts:
     create:
@@ -252,7 +252,7 @@ zh-TW:
     show:
       delete: "刪除並中止對話"
       reply: "回覆"
-      replying: 回應中...
+      replying: 回覆中...
   date:
     formats:
       birthday: "%B %d"
@@ -357,21 +357,21 @@ zh-TW:
       many: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
       one: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
       other: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
-      two: "%{actors} 也回應了 %{post_author} 的%{post_link}."
+      two: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
       zero: "%{actors} 也對 %{post_author} 的%{post_link}發表了意見."
     also_commented_deleted:
-      few: "%{actors} 回應了已刪掉的貼文."
-      many: "%{actors} 回應了已刪掉的貼文."
-      one: "%{actors} 回應了已刪掉的貼文."
-      other: "%{actors} 回應了已刪掉的貼文."
-      two: "%{actors} 回應了已刪掉的貼文."
-      zero: "%{actors} 回應了已刪掉的貼文."
+      few: "%{actors} 對已刪掉的貼文發表了意見."
+      many: "%{actors} 對已刪掉的貼文發表了意見."
+      one: "%{actors} 對已刪掉的貼文發表了意見."
+      other: "%{actors} 對已刪掉的貼文發表了意見."
+      two: "%{actors} 對已刪掉的貼文發表了意見."
+      zero: "%{actors} 對已刪掉的貼文發表了意見."
     comment_on_post:
       few: "%{actors} 對你的%{post_link}發表了意見."
       many: "%{actors} 對你的%{post_link}發表了意見."
       one: "%{actors} 對你的%{post_link}發表了意見."
       other: "%{actors} 對你的%{post_link}發表了意見."
-      two: "%{actors} 回應了你的%{post_link}."
+      two: "%{actors} 對你的%{post_link}發表了意見."
       zero: "%{actors} 對你的%{post_link}發表了意見."
     helper:
       new_notifications:
@@ -472,7 +472,7 @@ zh-TW:
       view_post: "看貼文 >"
     single_admin:
       admin: "為您服務的 Diaspora 管理員"
-      subject: "關於你的 Diaspora 帳號的訊息:"
+      subject: "有關於你的 Diaspora 帳號的訊息:"
     started_sharing:
       sharing: 開始跟你分享了!
       subject: "%{name} 開始在 Diaspora* 跟你分享了"
@@ -494,7 +494,7 @@ zh-TW:
       results_for: "%{params}的搜尋結果"
     index:
       couldnt_find_them_send_invite: "找不到他們? 寄一封邀請函吧!"
-      looking_for: "Looking for posts tagged %{tag_link}?"
+      looking_for: "在找標記為 %{tag_link} 的貼文嗎?"
       no_one_found: "...找不到任何東西."
       no_results: "嘿! 搜尋要有目標."
       results_for: "搜尋結果:"
@@ -740,7 +740,7 @@ zh-TW:
       outside: "不使用 Diaspora 的人也能看到公開訊息."
       share: "分享"
       title: "設定連線服務"
-      visibility_dropdown: "用這個下拉式選單來改變貼文的可見範圍.  (建議你第一篇設為公開.)"
+      visibility_dropdown: "用這個下拉式選單來改變貼文的可見範圍.  (建議你這篇首貼設為公開.)"
     publisher:
       all: "全部"
       all_contacts: "所有聯絡人"
@@ -750,6 +750,7 @@ zh-TW:
         hello: "大家好, 我是 #%{new_user_tag}. "
         i_like: "我對 %{tags} 有興趣."
         invited_by: "謝謝你的邀請, "
+        newhere: "新人"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: 發表中...
       publishing_to: "發表至: "
@@ -760,8 +761,8 @@ zh-TW:
     reshare:
       reshare: "轉貼"
     stream_element:
-      connect_to_comment: "要回應貼文請先和作者建立聯繫"
-      currently_unavailable: "目前無法回應"
+      connect_to_comment: "請先和作者建立聯繫才能對他們的貼文發表意見"
+      currently_unavailable: "目前無法發表意見"
       dislike: "遜"
       hide_and_mute: "隱藏貼文並消音"
       ignore_user: "忽視 %{name}"
@@ -790,12 +791,12 @@ zh-TW:
   stream_helper:
     hide_comments: "隱藏所有意見"
     show_comments:
-      few: "Show %{count} more comments"
-      many: "Show %{count} more comments"
-      one: "Show one more comment"
-      other: "Show %{count} more comments"
-      two: "Show two more comments"
-      zero: "No more comments"
+      few: "顯示另外 %{count} 個意見"
+      many: "顯示另外 %{count} 個意見"
+      one: "顯示另外一個意見"
+      other: "顯示另外 %{count} 個意見"
+      two: "顯示另外兩個意見"
+      zero: "沒有其它意見"
   streams:
     aspects:
       title: "你的面向"
@@ -822,7 +823,7 @@ zh-TW:
     recently: "最近:"
     tags:
       contacts_title: "這個標籤的粉絲"
-      tag_prefill_text: "The thing about %{tag_name} is... "
+      tag_prefill_text: "有關於 %{tag_name} 的事情是... "
       title: "有以下標籤的貼文: %{tags}"
   tag_followings:
     create:
diff --git a/config/locales/javascript/javascript.bg.yml b/config/locales/javascript/javascript.bg.yml
index c919ccd5e393e513256a016794e062a1ed8033da..c811efcd12d85b1acf139c0a1ef328e0b912d293 100644
--- a/config/locales/javascript/javascript.bg.yml
+++ b/config/locales/javascript/javascript.bg.yml
@@ -35,7 +35,7 @@ bg:
       no_tags: "Не следите нито една марка!  Желаете ли да продължите въпреки това?"
       preparing_your_stream: "Вашият персонализиран поток се подготвя..."
     infinite_scroll:
-      no_more: "Няма повече публикации."
+      no_more: "Няма други публикации."
     photo_uploader:
       looking_good: "Леле, изглеждате страхотно!"
     publisher:
diff --git a/config/locales/javascript/javascript.da.yml b/config/locales/javascript/javascript.da.yml
index 04c73c77e7797050ee58ccbe7e1e8ff3a41a2702..c65b78b6c82aab3c341aa3a4a573de7a7a3b487a 100644
--- a/config/locales/javascript/javascript.da.yml
+++ b/config/locales/javascript/javascript.da.yml
@@ -8,7 +8,7 @@ da:
     aspect_dropdown:
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Kunne ikke begynde at dele med {{name}}.  Ignorer du vedkommende?"
       select_aspects: "Vælg aspekter"
       started_sharing_with: "Du er begyndt at dele med {{name}}!"
       stopped_sharing_with: "Du deler ikke længere med {{name}}."
@@ -47,7 +47,7 @@ da:
     search_for: "Søg efter {{name}}"
     show_more: "Vis mere"
     tags:
-      wasnt_that_interesting: "OK, jeg formoder #{{tagName}} var ikke så spændende ..."
+      wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..."
     timeago:
       day: "en dag"
       days: "%d dage"
diff --git a/config/locales/javascript/javascript.fi.yml b/config/locales/javascript/javascript.fi.yml
index f5a1f647a8b407ef383fd2ec5b41ba28634e4192..908f3864d993afba028de124e6be91ef6b90e20d 100644
--- a/config/locales/javascript/javascript.fi.yml
+++ b/config/locales/javascript/javascript.fi.yml
@@ -33,7 +33,7 @@ fi:
       alright_ill_wait: "Okei, minä odotan."
       hey: "Hei {{name}}!"
       no_tags: "Hei, et seuraa yhtäkään tagia!  Jatketaanko silti?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      preparing_your_stream: "Yksilöllistä virtaasi valmistellaan..."
     infinite_scroll:
       no_more: "Ei enempää viestejä."
     photo_uploader:
diff --git a/config/locales/javascript/javascript.fr.yml b/config/locales/javascript/javascript.fr.yml
index 5774b48a217e10b5753b95ac900de3405e72c0e0..3b9df1b9080a15ec53175b8b3c1ee1bf42a0b727 100644
--- a/config/locales/javascript/javascript.fr.yml
+++ b/config/locales/javascript/javascript.fr.yml
@@ -8,7 +8,7 @@ fr:
     aspect_dropdown:
       add_to_aspect: "Ajouter le contact"
       all_aspects: "Tous les aspects"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Impossible de partager avec {{name}}. Ignorez-vous cette personne ?"
       select_aspects: "Choisir les aspects"
       started_sharing_with: "Vous avez commencé à partager avec {{name}} !"
       stopped_sharing_with: "Vous avez arrêté de partager avec {{name}}."
diff --git a/config/locales/javascript/javascript.ko.yml b/config/locales/javascript/javascript.ko.yml
index 4cc1c3c539798e975cdffd52257949538ed90d67..039a374352644a79f7f61d312c5ea4f7668b13ff 100644
--- a/config/locales/javascript/javascript.ko.yml
+++ b/config/locales/javascript/javascript.ko.yml
@@ -8,7 +8,7 @@ ko:
     aspect_dropdown:
       add_to_aspect: "애스펙에 넣기"
       all_aspects: "모든 에스팩"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "{{name}}님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
       select_aspects: "에스팩 선택"
       started_sharing_with: "{{name}}님과의 공유를 시작합니다!"
       stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다."
diff --git a/config/locales/javascript/javascript.sk.yml b/config/locales/javascript/javascript.sk.yml
index 47373607950ea51311fc6cdbd21293df8c236650..7f5891f2a2b192bf53376f4540cee520bb5f7ab3 100644
--- a/config/locales/javascript/javascript.sk.yml
+++ b/config/locales/javascript/javascript.sk.yml
@@ -8,10 +8,10 @@ sk:
     aspect_dropdown:
       add_to_aspect: "Pridať kontakt"
       all_aspects: "Všetky kategórie"
-      error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+      error: "Nemôžete sa začať deliť s použ. {{name}}. Neignorujete ho (ju)?"
       select_aspects: "Vyberte si kategórie"
-      started_sharing_with: "You have started sharing with {{name}}!"
-      stopped_sharing_with: "You have stopped sharing with {{name}}."
+      started_sharing_with: "Začali ste sa deliť s použ. {{name}}!"
+      stopped_sharing_with: "Prestali ste sa deliť s použ. {{name}}."
       toggle:
         few: "V(o) {{count}} kategóriách"
         many: "V(o) {{count}} kategóriách"
@@ -30,24 +30,24 @@ sk:
     failed_to_like: "Nepodarilo sa označiť, že sa vám to páči!"
     failed_to_post_message: "Správu sa nepodarilo poslať!"
     getting_started:
-      alright_ill_wait: "Alright, I'll wait."
-      hey: "Hey, {{name}}!"
-      no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
-      preparing_your_stream: "Preparing your personialized stream..."
+      alright_ill_wait: "V poriadku, počkám."
+      hey: "Hej, {{name}}!"
+      no_tags: "Hej, nesledujete žiadne značky!  Chcete aj tak pokračovať?"
+      preparing_your_stream: "Pripravuje sa vaša upravená nástenka..."
     infinite_scroll:
       no_more: "Žiadne ďalšie príspevky."
     photo_uploader:
-      looking_good: "OMG, you look awesome!"
+      looking_good: "No teda, vyzeráš super!"
     publisher:
       at_least_one_aspect: "Musíte publikovať aspoň jednu kategóriu"
       limited: "Obmedzené - váš príspevok uvidia len ľudia, s ktorými sa oň podelíte"
       public: "Verejný - váš príspevok pomocou vyhľadávačov uvidí a nájde každý"
     reshares:
-      duplicate: "O tento príspevok ste sa už raz znova podelili!"
+      duplicate: "To je dobré, čo? Tento príspevok ste už raz znova zdieľali!"
     search_for: "Hľadať {{name}}"
     show_more: "Zobraziť viac"
     tags:
-      wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+      wasnt_that_interesting: "Dobre, značka #{{tagName}} asi nebola veľmi zaujímavá..."
     timeago:
       day: "včera"
       days: "%d dňami"
diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature
index 714c664735cf90e155cec893b94a77c91c2e913f..41bcddf1241f0c688a6aa4b3eb5ae908a5458d5a 100644
--- a/features/posts_from_main_page.feature
+++ b/features/posts_from_main_page.feature
@@ -53,7 +53,7 @@ Feature: posting from the main page
       Then I should see a "img" within ".stream_element div.photo_attachments"
       And I should see "Look at this dog" within ".stream_element"
 
-    Scenario: post a photo without text 
+    Scenario: post a photo without text
       Given I expand the publisher
       When I attach the file "spec/fixtures/button.png" to hidden element "file" within "#file-upload"
       And I wait for the ajax to finish
@@ -192,3 +192,17 @@ Feature: posting from the main page
       And I select only "NotPostingThingsHere" aspect
       Then I should not see "I am eating a yogurt"
       Then I should not see "And cornflakes also"
+
+    Scenario: reject deletion one of my posts
+      When I expand the publisher
+      And I fill in "status_message_fake_text" with "I am eating a yogurt"
+      And I press "Share"
+      And I wait for the ajax to finish
+
+      When I click the aspects title
+      And I hover over the ".stream_element"
+      And I preemptively reject the alert
+      And I click to delete the first post
+      Then I should see "I am eating a yogurt"
+      And I should see first post deletion link
+      And I should not see ajax loader on deletion link place
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
index 1a8cc7bd8f0eed9ff4e43216886dc88189c28026..77e5f7e23a0c5a037c5c45f78c4778eab21d368c 100644
--- a/features/step_definitions/custom_web_steps.rb
+++ b/features/step_definitions/custom_web_steps.rb
@@ -11,6 +11,10 @@ And /^I expand the publisher$/ do
     ')
 end
 
+When 'I click the aspects title' do
+  find('.home_selector').click
+end
+
 When /^I press the aspect dropdown$/ do
   find('.dropdown .button').click
 end
@@ -194,7 +198,7 @@ When /^I resize my window to 800x600$/ do
   JS
 end
 
-Then /^I follow Edit Profile in the same window$/ do 
+Then /^I follow Edit Profile in the same window$/ do
   page.execute_script("$('a[href=\"#{edit_profile_path}\"]').removeAttr('target')")
 
   And %(I follow "Edit Profile")
@@ -213,9 +217,16 @@ And "I wait for the popovers to appear" do
 end
 
 And /^I click close on all the popovers$/ do
-  page.execute_script("var time = 400; $('.popover .close').each( 
+  page.execute_script("var time = 400; $('.popover .close').each(
           function(index, element){ setTimeout(function(){ $(element).click()},time);
           time += 800;
  });")
 end
 
+Then /^I should see first post deletion link$/ do
+  page.evaluate_script("$('.stream_element .delete').first().css('display')").should == "inline"
+end
+
+Then /^I should not see ajax loader on deletion link place$/ do
+  page.evaluate_script("$('.hide_loader').first().css('display')").should == "none"
+end
diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js
index 92e17fd7af89b202de560e67a5da4cb178e41767..499fd722ec808a8bfc8061cab212a78da4f4c33e 100644
--- a/public/javascripts/publisher.js
+++ b/public/javascripts/publisher.js
@@ -508,6 +508,7 @@ var Publisher = {
     Publisher.input().autoResize();
     Publisher.input().keydown(Publisher.autocompletion.keyDownHandler);
     Publisher.input().keyup(Publisher.autocompletion.keyUpHandler);
+    Publisher.input().mouseup(Publisher.autocompletion.keyUpHandler);
     Publisher.bindAjax();
     Publisher.form().find("textarea").bind("focus", function(evt) {
       Publisher.open();
diff --git a/public/javascripts/widgets/stream-element.js b/public/javascripts/widgets/stream-element.js
index a042da3a727932a18b388cfffac586e6700dc253..5f1f0ecd3cdb0cb81e37c08a644b6da2f232ae09 100644
--- a/public/javascripts/widgets/stream-element.js
+++ b/public/javascripts/widgets/stream-element.js
@@ -44,10 +44,10 @@
       self.deletePostLink.click(function(evt) {
         evt.preventDefault();
 
-        $([
-          self.deletePostLink,
-          self.hidePostLoader
-        ]).toggleClass("hidden");
+        self.hidePostLoader.ajaxStart( function() {
+          self.deletePostLink.addClass("hidden");
+          $(this).removeClass('hidden');
+        } );
       });
 
       self.focusCommentLink.click(function(evt) {
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index 167f0d184a665bc6205b4f7d92237a3ece0a89e3..c0a5502b2c678afd52448dc4d7568c15f5163634 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -137,6 +137,12 @@ describe PhotosController do
         get :show, :id => @photo.to_param
         response.should redirect_to(aspects_path)
       end
+      
+      it 'redirects to the sign in page if not logged in' do
+        controller.stub(:user_signed_in?).and_return(false) #sign_out :user doesn't work
+        get :show, :id => @photo.to_param
+        response.should redirect_to new_user_session_path
+      end
     end
 
     context "public photo" do
diff --git a/spec/javascripts/widgets/stream-element-spec.js b/spec/javascripts/widgets/stream-element-spec.js
index bcd85999105a1763501515bf6615658f2b8907b8..98d7ea94010fe42fa38fc1dc196eb19764540069 100644
--- a/spec/javascripts/widgets/stream-element-spec.js
+++ b/spec/javascripts/widgets/stream-element-spec.js
@@ -18,6 +18,7 @@ describe("Diaspora.Widgets.StreamElement", function() {
       expect(streamElement.hidePostLoader).toHaveClass("hidden");
       spyOn($, "ajax");
       streamElement.deletePostLink.click();
+      streamElement.hidePostLoader.triggerHandler('ajaxStart');
       jasmine.Clock.tick(200);
       expect($.ajax).toHaveBeenCalled();
       expect(streamElement.deletePostLink).toHaveClass("hidden");