Merge branch '1.0.x' into limitdist2

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 0a5333128069bd7c11aaac7739b1999af3f41c69..37e4a386a20cfb27e4f4ec6f85f4ced8f55ed3f4 100644 (file)
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -237,8 +237,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
             if ($activity->verb != ActivityVerb::JOIN) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
+                // TRANS: Client error displayed when not using the join verb.
                 throw new ClientException(_('Can only handle join activities.'));
                 return;
             }