diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 0c11d2517..229c5f52a 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -22,6 +22,28 @@
= t('aspects.index.cubbies.explanation')
= link_to t('aspects.index.cubbies.learn_more'), token_path
+.section
+ .title
+ = image_tag('/images/icons/question.png')
+ %h5
+ = t('aspects.index.help.need_help')
+ .content
+ = t('aspects.index.help.here_to_help')
+ %br
+ = t('aspects.index.help.did_you')
+ %br
+ != t('aspects.index.help.have_a_question', :link => link_to("#question" , tag_path(:name => "question")))
+ %br
+ != t('aspects.index.help.find_a_bug', :link => link_to("#bug" , tag_path(:name => "bug")))
+ %br
+ != t('aspects.index.help.feature_suggestion', :link => link_to("#feature" , tag_path(:name => "feature")))
+ %br
+ %br
+ %p
+ != t('aspects.index.help.satisfaction', :link => link_to("GetSatisfaction", "http://getsatisfaction.com/diaspora"))
+ %br
+ != t('aspects.index.help.tutorials', :link => link_to("Diasporial" , "http://diasporial.com/tutorials"))
+
- unless AppConfig.configured_services.blank? || all_services_connected?
.section
.title
@@ -56,22 +78,4 @@
%br
= render 'shared/donate'
-.section
- .title
- = image_tag('/images/icons/question.png')
- %h5
- = t('aspects.index.help.need_help')
- .content
- = t('aspects.index.help.here_to_help')
- %br
- != t('aspects.index.help.tutorials', :link => link_to("Diasporial" , "http://diasporial.com/tutorials"))
- %br
- = t('aspects.index.help.did_you')
- %br
- != t('aspects.index.help.have_a_question', :link => link_to("#question" , tag_path(:name => "question")))
- %br
- != t('aspects.index.help.find_a_bug', :link => link_to("#bug" , tag_path(:name => "bug")))
- %br
- != t('aspects.index.help.feature_suggestion', :link => link_to("#feature" , tag_path(:name => "feature")))
- %br
- != t('aspects.index.help.more_support', :link => link_to("GetSatisfaction", "http://getsatisfaction.com/diaspora"))
+
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 75521d1b7..d5ea7881d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -167,13 +167,13 @@ en:
people_sharing_with_you: "People sharing with you"
help:
need_help: "Need Help?"
- here_to_help: "Diaspora community is here to help!"
- tutorials: "For tutorials, check out %{link}."
+ here_to_help: "The Diaspora community is here!"
did_you: "Did you:"
have_a_question: "... have a %{link}?"
find_a_bug: "... find a %{link}?"
feature_suggestion: "... have a %{link} suggestion?"
- more_support: "For more support, you should also check out %{link}."
+ tutorials: "%{link}: Commuinity powered tutorials, how-to, and news"
+ satisfaction: "%{link}: Commuinity powered support"
cubbies:
heading: "Connect to Cubbi.es"
explanation: "Cubbi.es is the first Diaspora application under development."