Merge pull request #4095 from embs/feature/3064-add-services-explanation

Add explanation to services index page. Closes #3064

Changelog.md

@@ -123,6 +123,7 @@ by them self.
 * If sharing a post with photos to Facebook, always include URL to post [#3706](https://github.com/diaspora/diaspora/issues/3706)
 * Add multiphoto for mobile post. [#4065](https://github.com/diaspora/diaspora/issues/4065)
 * Add hotkeys to navigate in stream [#4089](https://github.com/diaspora/diaspora/pull/4089)
+* Add a brief explanatory text about external services connections to services index page [#3064](https://github.com/diaspora/diaspora/issues/3064)
 
 # 0.0.3.4
 

app/views/services/index.html.haml

@@ -10,6 +10,9 @@
     = t('settings')
   = render 'shared/settings_nav'
 
-.span-19.prepend-5.last
+.span-14.prepend-5.last
   = render 'shared/add_remove_services'
 
+.span-5
+  %p
+    = t('.services_explanation')

config/locales/diaspora/en.yml

@@ -750,6 +750,7 @@ en:
       connect_to_tumblr: "Connect to Tumblr"
       edit_services: "Edit services"
       no_services: 'You have not connected any services yet.'
+      services_explanation: 'Connecting to services gives you the ability to publish your posts to them as you write them in Diaspora.'
     create:
       success: "Authentication successful."
       failure: "Authentication failed."