From: Brion Vibber <brion@pobox.com>
Date: Mon, 4 Oct 2010 18:42:16 +0000 (-0700)
Subject: Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5b49366f49b77fd677f415facb75c9b21c10b5d3;p=quix0rs-gnu-social.git

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

Conflicts:
	plugins/AnonymousFave/AnonymousFavePlugin.php
---

5b49366f49b77fd677f415facb75c9b21c10b5d3
diff --cc plugins/AnonymousFave/AnonymousFavePlugin.php
index be93c1704f,6561114bab..96edf82e12
--- a/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');
          }
      }