Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

diff --git a/actions/showapplication.php b/actions/showapplication.php
index a6ff425c7c5f285c3becb776c012db2d1d2701df..090e11882ebe49c6f0b59cc4f3f097dc6990a9f3 100644 (file)
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -201,7 +201,7 @@ class ShowApplicationAction extends OwnerDesignAction
         $userCnt = $appUsers->count();
 
         $this->raw(sprintf(
-            _('created by %1$s - %2$s access by default - %3$d users'),
+            _('Created by %1$s - %2$s access by default - %3$d users'),
               $profile->getBestName(),
               $defaultAccess,
               $userCnt

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0d6395d057a8843449343a075f525d856997649e..2240e42afc80e36a010f7b1ef74778edb82a30d5 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -632,7 +632,8 @@ margin-bottom:18px;
 .entity_profile .entity_url,
 .entity_profile .entity_note,
 .entity_profile .entity_tags,
-.entity_profile .entity_aliases {
+.entity_profile .entity_aliases,
+.entity_profile .entity_statistics {
 margin-left:113px;
 margin-bottom:4px;
 }