Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php

diff --cc plugins/AnonymousFave/AnonymousFavePlugin.php
index be93c1704f6cb206f9c29d33bb35e687209a287b,6561114babb02117683861617eaf75c2d7378d97..96edf82e12d26b2d786ad1679c48a3e3be06a017
--- 1/plugins/AnonymousFave/AnonymousFavePlugin.php
--- 2/plugins/AnonymousFave/AnonymousFavePlugin.php
+++ b/plugins/AnonymousFave/AnonymousFavePlugin.php
@@@ -202,12 -188,9 +202,13 @@@ class AnonymousFavePlugin extends Plugi
                      'class' => 'notice-tally'
                  )
              );
 -            // TRANS: Tally for number of times a notice was favored.
 -            // TRANS: %d is the number of times a notice was favored.
 -            $out->raw(sprintf(_m("favored once", "favored %d times", $tally->count), $tally->count));
 +            $out->elementStart('span', array('class' => 'fave-tally-title'));
++            // TRANS: Label for tally for number of times a notice was favored.
 +            $out->raw(sprintf(_m("Favored")));
 +            $out->elementEnd('span');
 +            $out->elementStart('span', array('class' => 'fave-tally'));
 +            $out->raw($tally->count);
 +            $out->elementEnd('span');
              $out->elementEnd('div');
          }
      }