Merge remote-tracking branch 'origin/master' into fix-tagging

cosent · Mar 11, 2015 · 0f6207a · 0f6207a
2 parents dc3a85e + 9050b44
commit 0f6207a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plonesocial/activitystream/browser/prototype/post.html b/plonesocial/activitystream/browser/prototype/post.html
@@ -32,7 +32,7 @@ <h4 tal:content="activity_provider/Creator" class="name">
       </h4>
     </a>
     <p class="byline">
-      <em class="action" i18n:translate="label_says">says:</em>
+      <em class="action" i18n:translate="label_posted">posted</em>
       <time tal:content="activity_provider/date">
         8/23/2001 12:40:44 PM
       </time> |