Merge pull request #2772 from gandaro/interchanged-rss-atom

fixed a link titled 'RSS' linking to an atom feed

app/views/shared/_public_explain.haml

@@ -9,7 +9,7 @@
     =t('.outside')
     %br
     %br
-    = link_to "RSS", "#{current_user.public_url}.atom"
+    = link_to t('.atom_feed'), "#{current_user.public_url}.atom"
     %br
     - if current_user.services
       - for service in current_user.services

config/locales/diaspora/en.yml

@@ -803,6 +803,7 @@ en:
       outside: "Public messages will be available for others outside of Diaspora to see."
       logged_in: "logged in to %{service}"
       manage: "manage connected services"
+      atom_feed: "Atom feed"
     notification:
       new: "New %{type} from %{from}"
     contact_list: