Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php

diff --cc doc-src/about
index 6a0ceb10f58fb0b97b06c4370245b6e040a54bf8,5645c2cebe6ed30007eaae11e95d5178f77b4203..fcf2bf373a9776bfacd8a83cdc2a20dab32e4060
--- 1/doc-src/about
--- 2/doc-src/about
+++ b/doc-src/about
@@@ -1,5 -1,10 +1,9 @@@
+ <!-- Copyright 2008-2010 StatusNet Inc. and contributors. -->
+ <!-- Document licensed under Creative Commons Attribution 3.0 Unported. See -->
+ <!-- http://creativecommons.org/licenses/by/3.0/ for details. -->
+ 
  %%site.name%% is a
 -[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service
 -based on the Free Software [StatusNet](http://status.net/) tool.
 +social network based on the Free Software [GNU social](http://www.gnu.org/software/social/) tool.
  
  If you [register](%%action.register%%) for an account,
  you can post small (%%site.textlimit%% chars or less) text notices

diff --cc doc-src/faq
Simple merge

diff --cc lib/action.php
index d417c88fcea0a8cabd44ec010d5d87a82fd0603c,0e5d7ae361c0539569e8052c37bc5e73f31da952..31b5aa49547fd232cdce9a4f357541de71ce4339
--- 1/lib/action.php
--- 2/lib/action.php
+++ b/lib/action.php
@@@ -824,14 -922,20 +922,20 @@@ class Action extends HTMLOutputter // l
          $this->elementStart('dd', null);
          if (common_config('site', 'broughtby')) {
              // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 -            $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%).');
+             // TRANS: Text between [] is a link description, text between () is the link itself.
+             // TRANS: Make sure there is no whitespace between "]" and "(".
+             // TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
 +            $instr = _('**%%site.name%%** is a social network, courtesy of [%%site.broughtby%%](%%site.broughtbyurl%%).');
          } else {
              // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 -            $instr = _('**%%site.name%%** is a microblogging service.');
 +            $instr = _('**%%site.name%%** is a social network.');
          }
          $instr .= ' ';
          // TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 -        $instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
+         // TRANS: Make sure there is no whitespace between "]" and "(".
+         // TRANS: Text between [] is a link description, text between () is the link itself.
+         // TRANS: %s is the version of StatusNet that is being used.
 +        $instr .= sprintf(_('It runs on [GNU social](http://www.gnu.org/software/social/), version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
          $output = common_markup_to_html($instr);
          $this->raw($output);
          $this->elementEnd('dd');

diff --cc plugins/OStatus/actions/ostatusinit.php
index d7dee1ac71ae49e4d6de2eee12b672ffbc43bbfa,91c36203c88ff8d0d6accae6a6f482f7a031177e..25a52482d1515afffa201bf970a65a79cc851a82
--- 1/plugins/OStatus/actions/ostatusinit.php
--- 2/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@@ -91,13 -93,16 +93,17 @@@ class OStatusInitAction extends Actio
  
      function showContent()
      {
 +    
          if ($this->group) {
+             // TRANS: Form legend.
              $header = sprintf(_m('Join group %s'), $this->group);
-             $submit = _m('Join');
+             // TRANS: Button text.
+             $submit = _m('BUTTON','Join');
          } else {
+             // TRANS: Form legend.
              $header = sprintf(_m('Subscribe to %s'), $this->nickname);
-             $submit = _m('Subscribe');
+             // TRANS: Button text.
+             $submit = _m('BUTTON','Subscribe');
          }
          $this->elementStart('form', array('id' => 'form_ostatus_connect',
                                            'method' => 'post',
@@@ -114,8 -120,10 +121,9 @@@
          $this->hidden('group', $this->group); // pass-through for magic links
          $this->elementEnd('li');
          $this->elementStart('li', array('id' => 'ostatus_profile'));
+         // TRANS: Field label.
          $this->input('profile', _m('Profile Account'), $this->profile,
 -                      // TRANS: Tooltip for field label "Profile Account".
 -                     _m('Your account id (e.g. user@identi.ca).'));
 +                     _m("Your account id (i.e. user@status.net) -- with GNU social, users do not use one server to communicate in the way that Facebook and Twitter users do. Instead, users are spread out over a network of servers and different sites. You can run your own server, or you can sign up for one of the public servers -- it doesn't even need to be a GNU social server -- any server that speaks the OStatus protocol is suitable. A good place to get an account for yourself is www.status.net"));
          $this->elementEnd('li');
          $this->elementEnd('ul');
          $this->submit('submit', $submit);