diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 79094d841..0c11d2517 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -55,3 +55,23 @@
= t('aspects.index.keep_us_running', :pod => URI.parse(AppConfig[:pod_url]).host)
%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 a454d8bb8..7e8f216fd 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -156,7 +156,7 @@ en:
friends: "Friends"
index:
donate: "Donate"
- keep_us_running: "Keep %{pod} running fast, buy our servers their monthly coffee fix!"
+ keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
your_aspects: "Your Aspects"
tags_following: "Followed Tags"
no_tags: "+ Find a tag to follow"
@@ -165,6 +165,15 @@ en:
no_contacts: "No contacts"
post_a_message: "post a message >>"
people_sharing_with_you: "People sharing with you"
+ help:
+ need_help: "Need Help?"
+ here_to_help: "Diaspora community is here to help!"
+ tutorials: "For tutotials check out %{link}"
+ 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}"
cubbies:
heading: "Connect to Cubbi.es"
explanation: "Cubbi.es is the first Diaspora application under development."
diff --git a/public/images/icons/question.png b/public/images/icons/question.png
new file mode 100644
index 000000000..93b34f1df
Binary files /dev/null and b/public/images/icons/question.png differ