Merge branch 'tagprofile-ajax-fix' into 'nightly'

[quix0rs-gnu-social.git] / actions / conversation.php

diff --git a/actions/conversation.php b/actions/conversation.php
index 3b6f48c853f59a976d22e7340616f11e67e87162..5a6e4b5c7a51c6357c1b482fa9ad9aad280af73e 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -128,7 +128,7 @@ class ConversationAction extends ManagedAction
                                                     'format' => 'atom')),
                               // TRANS: Title for link to notice feed.
                               // TRANS: %s is a user nickname.
-                              _('Conversation feed (Activity Streams JSON)')));
+                              _('Conversation feed (Atom)')));
     }
 }