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

Conflicts:
	classes/statusnet.ini

99 files changed, 2613 insertions, 1054 deletions

diff --git a/actions/apigroupismember.php b/actions/apigroupismember.php
index a822d18dd..08348e97b 100644
--- a/actions/apigroupismember.php
+++ b/actions/apigroupismember.php
@@ -92,7 +92,7 @@ class ApiGroupIsMemberAction extends ApiBareAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigroupjoin.php b/actions/apigroupjoin.php
index ffda3986f..b531d9501 100644
--- a/actions/apigroupjoin.php
+++ b/actions/apigroupjoin.php
@@ -101,7 +101,7 @@ class ApiGroupJoinAction extends ApiAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigroupleave.php b/actions/apigroupleave.php
index 8665ea1aa..514a3a557 100644
--- a/actions/apigroupleave.php
+++ b/actions/apigroupleave.php
@@ -101,7 +101,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
         }
 
         if (empty($this->group)) {
-            $this->clientError('Group not found!', 404, $this->format);
+            $this->clientError(_('Group not found!'), 404, $this->format);
             return false;
         }
 
diff --git a/actions/apigroupmembership.php b/actions/apigroupmembership.php
index d221a6418..dd2843161 100644
--- a/actions/apigroupmembership.php
+++ b/actions/apigroupmembership.php
@@ -87,6 +87,11 @@ class ApiGroupMembershipAction extends ApiPrivateAuthAction
     {
         parent::handle($args);
 
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
         // XXX: RSS and Atom
 
         switch($this->format) {
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index b745ff92f..f9b960747 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -87,7 +87,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
 
         if (empty($this->group)) {
             $this->clientError(
-                'Group not found!',
+                _('Group not found!'),
                 404,
                 $this->format
             );
diff --git a/actions/apitimelinegroup.php b/actions/apitimelinegroup.php
index f25f6ba51..de13e7eb9 100644
--- a/actions/apitimelinegroup.php
+++ b/actions/apitimelinegroup.php
@@ -69,7 +69,6 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
         parent::prepare($args);
 
         $this->group   = $this->getTargetGroup($this->arg('id'));
-        $this->notices = $this->getNotices();
 
         return true;
     }
@@ -87,6 +86,13 @@ class ApiTimelineGroupAction extends ApiPrivateAuthAction
     function handle($args)
     {
         parent::handle($args);
+
+        if (empty($this->group)) {
+            $this->clientError(_('Group not found!'), 404, $this->format);
+            return false;
+        }
+
+        $this->notices = $this->getNotices();
         $this->showTimeline();
     }
 
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 802bcb081..86a61f20b 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -74,8 +74,11 @@ class UserbyidAction extends Action
             $this->clientError(_('No such user.'));
         }
 
-        // support redirecting to FOAF rdf/xml if the agent prefers it
-        $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
+        // Support redirecting to FOAF rdf/xml if the agent prefers it...
+        // Internet Explorer doesn't specify "text/html" and does list "*/*"
+        // at least through version 8. We need to list text/html up front to
+        // ensure that only user-agents who specifically ask for RDF get it.
+        $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
         $httpaccept = isset($_SERVER['HTTP_ACCEPT'])
                       ? $_SERVER['HTTP_ACCEPT'] : null;
         $type       = common_negotiate_type(common_accept_to_prefs($httpaccept),
diff --git a/classes/Plugin_DataObject.php b/classes/Plugin_DataObject.php
new file mode 100644
index 000000000..d5cecf0f7
--- /dev/null
+++ b/classes/Plugin_DataObject.php
@@ -0,0 +1,195 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+
+abstract class Plugin_DataObject extends Memcached_DataObject
+{
+    function table() {
+        static $table = null;
+        if($table == null) {
+            $table = array();
+            $DB = $this->getDatabaseConnection();
+            $dbtype = $DB->phptype;
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                switch(strtoupper($columnDef->type)) {
+                    /*shamelessly copied from DB_DataObject_Generator*/
+                    case 'INT':
+                    case 'INT2':    // postgres
+                    case 'INT4':    // postgres
+                    case 'INT8':    // postgres
+                    case 'SERIAL4': // postgres
+                    case 'SERIAL8': // postgres
+                    case 'INTEGER':
+                    case 'TINYINT':
+                    case 'SMALLINT':
+                    case 'MEDIUMINT':
+                    case 'BIGINT':
+                        $type = DB_DATAOBJECT_INT;
+                        if ($columnDef->size == 1) {
+                            $type +=  DB_DATAOBJECT_BOOL;
+                        }
+                        break;
+                   
+                    case 'REAL':
+                    case 'DOUBLE':
+                    case 'DOUBLE PRECISION': // double precision (firebird)
+                    case 'FLOAT':
+                    case 'FLOAT4': // real (postgres)
+                    case 'FLOAT8': // double precision (postgres)
+                    case 'DECIMAL':
+                    case 'MONEY':  // mssql and maybe others
+                    case 'NUMERIC':
+                    case 'NUMBER': // oci8 
+                        $type = DB_DATAOBJECT_INT; // should really by FLOAT!!! / MONEY...
+                        break;
+                        
+                    case 'YEAR':
+                        $type = DB_DATAOBJECT_INT; 
+                        break;
+                        
+                    case 'BIT':
+                    case 'BOOL':   
+                    case 'BOOLEAN':   
+                    
+                        $type = DB_DATAOBJECT_BOOL;
+                        // postgres needs to quote '0'
+                        if ($dbtype == 'pgsql') {
+                            $type +=  DB_DATAOBJECT_STR;
+                        }
+                        break;
+                        
+                    case 'STRING':
+                    case 'CHAR':
+                    case 'VARCHAR':
+                    case 'VARCHAR2':
+                    case 'TINYTEXT':
+                    
+                    case 'ENUM':
+                    case 'SET':         // not really but oh well
+                    
+                    case 'POINT':       // mysql geometry stuff - not really string - but will do..
+                    
+                    case 'TIMESTAMPTZ': // postgres
+                    case 'BPCHAR':      // postgres
+                    case 'INTERVAL':    // postgres (eg. '12 days')
+                    
+                    case 'CIDR':        // postgres IP net spec
+                    case 'INET':        // postgres IP
+                    case 'MACADDR':     // postgress network Mac address.
+                    
+                    case 'INTEGER[]':   // postgres type
+                    case 'BOOLEAN[]':   // postgres type
+                    
+                        $type = DB_DATAOBJECT_STR;
+                        break;
+                    
+                    case 'TEXT':
+                    case 'MEDIUMTEXT':
+                    case 'LONGTEXT':
+                        
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TXT;
+                        break;
+                    
+                    
+                    case 'DATE':    
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE;
+                        break;
+                        
+                    case 'TIME':    
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    
+                    case 'DATETIME': 
+                         
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    case 'TIMESTAMP': // do other databases use this???
+                        
+                        $type = ($dbtype == 'mysql') ?
+                            DB_DATAOBJECT_MYSQLTIMESTAMP : 
+                            DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME;
+                        break;    
+                        
+                    
+                    case 'BLOB':       /// these should really be ignored!!!???
+                    case 'TINYBLOB':
+                    case 'MEDIUMBLOB':
+                    case 'LONGBLOB':
+                    
+                    case 'CLOB': // oracle character lob support
+                    
+                    case 'BYTEA':   // postgres blob support..
+                        $type = DB_DATAOBJECT_STR + DB_DATAOBJECT_BLOB;
+                        break;
+                        
+                    default:
+                        throw new Exception("Cannot handle datatype: $columnDef->type");
+                }
+                if(! $columnDef->nullable) {
+                    $type+=DB_DATAOBJECT_NOTNULL;
+                }
+                $table[$columnDef->name]=$type;
+            }
+        }
+        return $table;
+    }
+
+    function keys() {
+        static $keys = null;
+        if($keys == null) {
+            $keys = array();
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                if($columnDef->key != null){
+                    $keys[] = $columnDef->name;
+                }
+            }
+        }
+        return $keys;
+    }
+
+    function sequenceKey() {
+        static $sequenceKey = null;
+        if($sequenceKey == null) {
+            $sequenceKey = array(false,false);
+            $tableDef = $this->tableDef();
+            foreach($tableDef->columns as $columnDef){
+                if($columnDef->key == 'PRI' && $columnDef->auto_increment){
+                    $sequenceKey=array($columnDef->name,true);
+                }
+            }
+        }
+        return $sequenceKey;
+    }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * Ideally, this function would a static function, but PHP doesn't allow
+    * abstract static functions
+    * @return TableDef TableDef instance
+    */
+    abstract function tableDef();
+}
+
diff --git a/classes/Profile.php b/classes/Profile.php
index d52dff5af..1b9cdb52f 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -310,10 +310,12 @@ class Profile extends Memcached_DataObject
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
-        if (common_config('db','type') == 'pgsql') {
-            $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-        } else {
-            $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)){
+            if (common_config('db','type') == 'pgsql') {
+                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+            } else {
+                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+            }
         }
 
         $profile = new Profile();
@@ -333,11 +335,13 @@ class Profile extends Memcached_DataObject
           'AND subscription.subscribed != subscription.subscriber ' .
           'ORDER BY subscription.created DESC ';
 
-        if ($offset) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)){
+            if ($offset) {
+                if (common_config('db','type') == 'pgsql') {
+                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+                } else {
+                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+                }
             }
         }
 
diff --git a/classes/User.php b/classes/User.php
index a466369a1..f905ea2b7 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -577,11 +577,13 @@ class User extends Memcached_DataObject
           'WHERE group_member.profile_id = %d ' .
           'ORDER BY group_member.created DESC ';
 
-        if ($offset) {
-            if (common_config('db','type') == 'pgsql') {
-                $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
-            } else {
-                $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+        if ($offset>0 && !is_null($limit)) {
+            if ($offset) {
+                if (common_config('db','type') == 'pgsql') {
+                    $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+                } else {
+                    $qry .= ' LIMIT ' . $offset . ', ' . $limit;
+                }
             }
         }
 
diff --git a/classes/statusnet.ini b/classes/statusnet.ini
index 6a7be1008..b2509dac5 100644
--- a/classes/statusnet.ini
+++ b/classes/statusnet.ini
@@ -542,4 +542,4 @@ created = 142
 modified = 384
 
 [user_group__keys]
-id = N
+id = N
\ No newline at end of file
diff --git a/extlib/PEAR.php b/extlib/PEAR.php
index fcefa964a..4c24c6006 100644
--- a/extlib/PEAR.php
+++ b/extlib/PEAR.php
@@ -746,7 +746,7 @@ class PEAR
     {
         if (!extension_loaded($ext)) {
             // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
                 return false;
             }
             if (OS_WINDOWS) {
diff --git a/extlib/Stomp.php b/extlib/Stomp.php
index abd9cba62..b55a4aa6d 100644
--- a/extlib/Stomp.php
+++ b/extlib/Stomp.php
@@ -66,12 +66,13 @@ class Stomp
     protected $_sessionId;
     protected $_read_timeout_seconds = 60;
     protected $_read_timeout_milliseconds = 0;
+    protected $_connect_timeout_seconds = 60;
     
     /**
      * Constructor
      *
      * @param string $brokerUri Broker URL
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function __construct ($brokerUri)
     {
@@ -81,7 +82,7 @@ class Stomp
     /**
      * Initialize connection
      *
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     protected function _init ()
     {
@@ -103,14 +104,14 @@ class Stomp
             }
         } else {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Bad Broker URL {$this->_brokerUri}");
+            throw new StompException("Bad Broker URL {$this->_brokerUri}");
         }
     }
     /**
      * Process broker URL
      *
      * @param string $url Broker URL
-     * @throws Stomp_Exception
+     * @throws StompException
      * @return boolean
      */
     protected function _processUrl ($url)
@@ -120,19 +121,19 @@ class Stomp
             array_push($this->_hosts, array($parsed['host'] , $parsed['port'] , $parsed['scheme']));
         } else {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Bad Broker URL $url");
+            throw new StompException("Bad Broker URL $url");
         }
     }
     /**
      * Make socket connection to the server
      *
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     protected function _makeConnection ()
     {
         if (count($this->_hosts) == 0) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("No broker defined");
+            throw new StompException("No broker defined");
         }
         
         // force disconnect, if previous established connection exists
@@ -141,6 +142,9 @@ class Stomp
         $i = $this->_currentHost;
         $att = 0;
         $connected = false;
+        $connect_errno = null;
+        $connect_errstr = null;
+        
         while (! $connected && $att ++ < $this->_attempts) {
             if (isset($this->_params['randomize']) && $this->_params['randomize'] == 'true') {
                 $i = rand(0, count($this->_hosts) - 1);
@@ -158,10 +162,10 @@ class Stomp
                 fclose($this->_socket);
                 $this->_socket = null;
             }
-            $this->_socket = @fsockopen($scheme . '://' . $host, $port);
+            $this->_socket = @fsockopen($scheme . '://' . $host, $port, $connect_errno, $connect_errstr, $this->_connect_timeout_seconds);
             if (!is_resource($this->_socket) && $att >= $this->_attempts && !array_key_exists($i + 1, $this->_hosts)) {
                 require_once 'Stomp/Exception.php';
-                throw new Stomp_Exception("Could not connect to $host:$port ($att/{$this->_attempts})");
+                throw new StompException("Could not connect to $host:$port ($att/{$this->_attempts})");
             } else if (is_resource($this->_socket)) {
                 $connected = true;
                 $this->_currentHost = $i;
@@ -170,7 +174,7 @@ class Stomp
         }
         if (! $connected) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception("Could not connect to a broker");
+            throw new StompException("Could not connect to a broker");
         }
     }
     /**
@@ -179,7 +183,7 @@ class Stomp
      * @param string $username
      * @param string $password
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function connect ($username = '', $password = '')
     {
@@ -194,18 +198,18 @@ class Stomp
 		if ($this->clientId != null) {
 			$headers["client-id"] = $this->clientId;
 		}
-		$frame = new Stomp_Frame("CONNECT", $headers);
+		$frame = new StompFrame("CONNECT", $headers);
         $this->_writeFrame($frame);
         $frame = $this->readFrame();
-        if ($frame instanceof Stomp_Frame && $frame->command == 'CONNECTED') {
+        if ($frame instanceof StompFrame && $frame->command == 'CONNECTED') {
             $this->_sessionId = $frame->headers["session"];
             return true;
         } else {
             require_once 'Stomp/Exception.php';
-            if ($frame instanceof Stomp_Frame) {
-                throw new Stomp_Exception("Unexpected command: {$frame->command}", 0, $frame->body);
+            if ($frame instanceof StompFrame) {
+                throw new StompException("Unexpected command: {$frame->command}", 0, $frame->body);
             } else {
-                throw new Stomp_Exception("Connection not acknowledged");
+                throw new StompException("Connection not acknowledged");
             }
         }
     }
@@ -232,21 +236,21 @@ class Stomp
      * Send a message to a destination in the messaging system 
      *
      * @param string $destination Destination queue
-     * @param string|Stomp_Frame $msg Message
+     * @param string|StompFrame $msg Message
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
      */
-    public function send ($destination, $msg, $properties = null, $sync = null)
+    public function send ($destination, $msg, $properties = array(), $sync = null)
     {
-        if ($msg instanceof Stomp_Frame) {
+        if ($msg instanceof StompFrame) {
             $msg->headers['destination'] = $destination;
-            $msg->headers = array_merge($msg->headers, $properties);
+            if (is_array($properties)) $msg->headers = array_merge($msg->headers, $properties);
             $frame = $msg;
         } else {
             $headers = $properties;
             $headers['destination'] = $destination;
-            $frame = new Stomp_Frame('SEND', $headers, $msg);
+            $frame = new StompFrame('SEND', $headers, $msg);
         }
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
@@ -255,10 +259,10 @@ class Stomp
     /**
      * Prepair frame receipt
      *
-     * @param Stomp_Frame $frame
+     * @param StompFrame $frame
      * @param boolean $sync
      */
-    protected function _prepareReceipt (Stomp_Frame $frame, $sync)
+    protected function _prepareReceipt (StompFrame $frame, $sync)
     {
         $receive = $this->sync;
         if ($sync !== null) {
@@ -271,12 +275,12 @@ class Stomp
     /**
      * Wait for receipt
      *
-     * @param Stomp_Frame $frame
+     * @param StompFrame $frame
      * @param boolean $sync
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
-    protected function _waitForReceipt (Stomp_Frame $frame, $sync)
+    protected function _waitForReceipt (StompFrame $frame, $sync)
     {
 
         $receive = $this->sync;
@@ -289,19 +293,19 @@ class Stomp
                 return true;
             }
             $frame = $this->readFrame();
-            if ($frame instanceof Stomp_Frame && $frame->command == 'RECEIPT') {
+            if ($frame instanceof StompFrame && $frame->command == 'RECEIPT') {
                 if ($frame->headers['receipt-id'] == $id) {
                     return true;
                 } else {
                     require_once 'Stomp/Exception.php';
-                    throw new Stomp_Exception("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body);
+                    throw new StompException("Unexpected receipt id {$frame->headers['receipt-id']}", 0, $frame->body);
                 }
             } else {
                 require_once 'Stomp/Exception.php';
-                if ($frame instanceof Stomp_Frame) {
-                    throw new Stomp_Exception("Unexpected command {$frame->command}", 0, $frame->body);
+                if ($frame instanceof StompFrame) {
+                    throw new StompException("Unexpected command {$frame->command}", 0, $frame->body);
                 } else {
-                    throw new Stomp_Exception("Receipt not received");
+                    throw new StompException("Receipt not received");
                 }
             }
         }
@@ -314,7 +318,7 @@ class Stomp
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function subscribe ($destination, $properties = null, $sync = null)
     {
@@ -329,7 +333,7 @@ class Stomp
             }
         }
         $headers['destination'] = $destination;
-        $frame = new Stomp_Frame('SUBSCRIBE', $headers);
+        $frame = new StompFrame('SUBSCRIBE', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         if ($this->_waitForReceipt($frame, $sync) == true) {
@@ -346,7 +350,7 @@ class Stomp
      * @param array $properties
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function unsubscribe ($destination, $properties = null, $sync = null)
     {
@@ -357,7 +361,7 @@ class Stomp
             }
         }
         $headers['destination'] = $destination;
-        $frame = new Stomp_Frame('UNSUBSCRIBE', $headers);
+        $frame = new StompFrame('UNSUBSCRIBE', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         if ($this->_waitForReceipt($frame, $sync) == true) {
@@ -373,7 +377,7 @@ class Stomp
      * @param string $transactionId
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function begin ($transactionId = null, $sync = null)
     {
@@ -381,7 +385,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('BEGIN', $headers);
+        $frame = new StompFrame('BEGIN', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -392,7 +396,7 @@ class Stomp
      * @param string $transactionId
      * @param boolean $sync Perform request synchronously
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function commit ($transactionId = null, $sync = null)
     {
@@ -400,7 +404,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('COMMIT', $headers);
+        $frame = new StompFrame('COMMIT', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -417,7 +421,7 @@ class Stomp
         if (isset($transactionId)) {
             $headers['transaction'] = $transactionId;
         }
-        $frame = new Stomp_Frame('ABORT', $headers);
+        $frame = new StompFrame('ABORT', $headers);
         $this->_prepareReceipt($frame, $sync);
         $this->_writeFrame($frame);
         return $this->_waitForReceipt($frame, $sync);
@@ -426,15 +430,19 @@ class Stomp
      * Acknowledge consumption of a message from a subscription
 	 * Note: This operation is always asynchronous
      *
-     * @param string|Stomp_Frame $messageMessage ID
+     * @param string|StompFrame $messageMessage ID
      * @param string $transactionId
      * @return boolean
-     * @throws Stomp_Exception
+     * @throws StompException
      */
     public function ack ($message, $transactionId = null)
     {
-        if ($message instanceof Stomp_Frame) {
-            $frame = new Stomp_Frame('ACK', $message->headers);
+        if ($message instanceof StompFrame) {
+            $headers = $message->headers;
+            if (isset($transactionId)) {
+                $headers['transaction'] = $transactionId;
+            }			
+            $frame = new StompFrame('ACK', $headers);
             $this->_writeFrame($frame);
             return true;
         } else {
@@ -443,7 +451,7 @@ class Stomp
                 $headers['transaction'] = $transactionId;
             }
             $headers['message-id'] = $message;
-            $frame = new Stomp_Frame('ACK', $headers);
+            $frame = new StompFrame('ACK', $headers);
             $this->_writeFrame($frame);
             return true;
         }
@@ -461,7 +469,7 @@ class Stomp
 		}
 
         if (is_resource($this->_socket)) {
-            $this->_writeFrame(new Stomp_Frame('DISCONNECT', $headers));
+            $this->_writeFrame(new StompFrame('DISCONNECT', $headers));
             fclose($this->_socket);
         }
         $this->_socket = null;
@@ -474,13 +482,13 @@ class Stomp
     /**
      * Write frame to server
      *
-     * @param Stomp_Frame $stompFrame
+     * @param StompFrame $stompFrame
      */
-    protected function _writeFrame (Stomp_Frame $stompFrame)
+    protected function _writeFrame (StompFrame $stompFrame)
     {
         if (!is_resource($this->_socket)) {
             require_once 'Stomp/Exception.php';
-            throw new Stomp_Exception('Socket connection hasn\'t been established');
+            throw new StompException('Socket connection hasn\'t been established');
         }
 
         $data = $stompFrame->__toString();
@@ -504,9 +512,9 @@ class Stomp
     }
     
     /**
-     * Read responce frame from server
+     * Read response frame from server
      *
-     * @return Stomp_Frame|Stomp_Message_Map|boolean False when no frame to read
+     * @return StompFrame False when no frame to read
      */
     public function readFrame ()
     {
@@ -516,15 +524,21 @@ class Stomp
         
         $rb = 1024;
         $data = '';
+        $end = false;
+        
         do {
-            $read = fgets($this->_socket, $rb);
+            $read = fread($this->_socket, $rb);
             if ($read === false) {
                 $this->_reconnect();
                 return $this->readFrame();
             }
             $data .= $read;
+            if (strpos($data, "\x00") !== false) {
+                $end = true;
+                $data = rtrim($data, "\n");
+            }
             $len = strlen($data);
-        } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")));
+        } while ($len < 2 || $end == false);
         
         list ($header, $body) = explode("\n\n", $data, 2);
         $header = explode("\n", $header);
@@ -538,13 +552,14 @@ class Stomp
                 $command = $v;
             }
         }
-        $frame = new Stomp_Frame($command, $headers, trim($body));
-        if (isset($frame->headers['amq-msg-type']) && $frame->headers['amq-msg-type'] == 'MapMessage') {
+        $frame = new StompFrame($command, $headers, trim($body));
+        if (isset($frame->headers['transformation']) && $frame->headers['transformation'] == 'jms-map-json') {
             require_once 'Stomp/Message/Map.php';
-            return new Stomp_Message_Map($frame);
+            return new StompMessageMap($frame);
         } else {
             return $frame;
         }
+        return $frame;
     }
     
     /**
@@ -558,10 +573,14 @@ class Stomp
         $write = null;
         $except = null;
         
-        $has_frame_to_read = stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
+        $has_frame_to_read = @stream_select($read, $write, $except, $this->_read_timeout_seconds, $this->_read_timeout_milliseconds);
+        
+        if ($has_frame_to_read !== false)
+            $has_frame_to_read = count($read);
+
 
         if ($has_frame_to_read === false) {
-            throw new Stomp_Exception('Check failed to determin if the socket is readable');
+            throw new StompException('Check failed to determine if the socket is readable');
         } else if ($has_frame_to_read > 0) {
             return true;
         } else {
diff --git a/extlib/Stomp/Exception.php b/extlib/Stomp/Exception.php
index e6870bc15..8c479de24 100644
--- a/extlib/Stomp/Exception.php
+++ b/extlib/Stomp/Exception.php
@@ -23,10 +23,8 @@
  *
  *
  * @package Stomp
- * @author Michael Caplan <mcaplan@labnet.net>
- * @version $Revision: 23 $
- */

-class Stomp_Exception extends Exception

+ */
+class StompException extends Exception
 {
     protected $_details;
     
@@ -53,5 +51,5 @@ class Stomp_Exception extends Exception
     {
         return $this->_details;
     }
-}

+}
 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php
index dc59c1cb7..195e3b627 100644
--- a/extlib/Stomp/Frame.php
+++ b/extlib/Stomp/Frame.php
@@ -1,33 +1,29 @@
-<?php
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vim: set expandtab tabstop=3 shiftwidth=3: */
+<?php

+/**

+ *

+ * Copyright 2005-2006 The Apache Software Foundation

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+/* vim: set expandtab tabstop=3 shiftwidth=3: */

 

 /**

- * Stomp Frames are messages that are sent and received on a StompConnection.

+ * Stomp Frames are messages that are sent and received on a stomp connection.

  *

  * @package Stomp

- * @author Hiram Chirino <hiram@hiramchirino.com>

- * @author Dejan Bosanac <dejan@nighttale.net>

- * @author Michael Caplan <mcaplan@labnet.net>

- * @version $Revision: 36 $

  */

-class Stomp_Frame

+class StompFrame

 {

     public $command;

     public $headers = array();

@@ -54,27 +50,27 @@ class Stomp_Frame
         $this->body = $body;

         

         if ($this->command == 'ERROR') {

-            require_once 'Stomp/Exception.php';

-            throw new Stomp_Exception($this->headers['message'], 0, $this->body);

+            require_once 'Exception.php';

+            throw new StompException($this->headers['message'], 0, $this->body);

+        }

+    }

+    

+    /**

+     * Convert frame to transportable string

+     *

+     * @return string

+     */

+    public function __toString()

+    {

+        $data = $this->command . "\n";

+        

+        foreach ($this->headers as $name => $value) {

+            $data .= $name . ": " . $value . "\n";

         }

-    }
-    
-    /**
-     * Convert frame to transportable string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $data = $this->command . "\n";
-        
-        foreach ($this->headers as $name => $value) {
-            $data .= $name . ": " . $value . "\n";
-        }
-        
-        $data .= "\n";
-        $data .= $this->body;
-        return $data .= "\x00\n";
+        

+        $data .= "\n";

+        $data .= $this->body;

+        return $data .= "\x00";

     }

 }

 ?>
\ No newline at end of file
diff --git a/extlib/Stomp/Message.php b/extlib/Stomp/Message.php
index 6bcad3efd..5a064090c 100644
--- a/extlib/Stomp/Message.php
+++ b/extlib/Stomp/Message.php
@@ -24,10 +24,8 @@ require_once 'Stomp/Frame.php';
  * Basic text stomp message
  *
  * @package Stomp
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @version $Revision: 23 $
  */
-class Stomp_Message extends Stomp_Frame
+class StompMessage extends StompFrame
 {
     public function __construct ($body, $headers = null)
     {
diff --git a/extlib/Stomp/Message/Map.php b/extlib/Stomp/Message/Map.php
index 288456a84..38a32c56c 100644
--- a/extlib/Stomp/Message/Map.php
+++ b/extlib/Stomp/Message/Map.php
@@ -24,30 +24,28 @@ require_once 'Stomp/Message.php';
  * Message that contains a set of name-value pairs
  *
  * @package Stomp
- * @author Dejan Bosanac <dejan@nighttale.net>
- * @version $Revision: 23 $
  */
-class Stomp_Message_Map extends Stomp_Message
+class StompMessageMap extends StompMessage
 {
     public $map;
     
     /**
      * Constructor
      *
-     * @param Stomp_Frame|string $msg
+     * @param StompFrame|string $msg
      * @param array $headers
      */
     function __construct ($msg, $headers = null)
     {
-        if ($msg instanceof Stomp_Frame) {
+        if ($msg instanceof StompFrame) {
             $this->_init($msg->command, $msg->headers, $msg->body);
-            $this->map = json_decode($msg->body);
+            $this->map = json_decode($msg->body, true);
         } else {
             $this->_init("SEND", $headers, $msg);
             if ($this->headers == null) {
                 $this->headers = array();
             }
-            $this->headers['amq-msg-type'] = 'MapMessage';
+            $this->headers['transformation'] = 'jms-map-json';
             $this->body = json_encode($msg);
         }
     }
diff --git a/lib/command.php b/lib/command.php
index 2ec3320de..7e98156b6 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -605,6 +605,71 @@ class LoginCommand extends Command
     }
 }
 
+class SubscriptionsCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscriptions(0);
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('You are not subscribed to anyone.');
+        }else{
+            $out = ngettext('You are subscribed to this person:',
+                'You are subscribed to these people:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class SubscribersCommand extends Command
+{
+    function execute($channel)
+    {
+        $profile = $this->user->getSubscribers();
+        $nicknames=array();
+        while ($profile->fetch()) {
+            $nicknames[]=$profile->nickname;
+        }
+        if(count($nicknames)==0){
+            $out=_('No one is subscribed to you.');
+        }else{
+            $out = ngettext('This person is subscribed to you:',
+                'These people are subscribed to you:',
+                count($nicknames));
+            $out .= ' ';
+            $out .= implode(', ',$nicknames);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
+class GroupsCommand extends Command
+{
+    function execute($channel)
+    {
+        $group = $this->user->getGroups();
+        $groups=array();
+        while ($group->fetch()) {
+            $groups[]=$group->nickname;
+        }
+        if(count($groups)==0){
+            $out=_('You are not a member of any groups.');
+        }else{
+            $out = ngettext('You are a member of this group:',
+                'You are a member of these groups:',
+                count($nicknames));
+            $out.=implode(', ',$groups);
+        }
+        $channel->output($this->user,$out);
+    }
+}
+
 class HelpCommand extends Command
 {
     function execute($channel)
@@ -615,6 +680,9 @@ class HelpCommand extends Command
                            "off - turn off notifications\n".
                            "help - show this help\n".
                            "follow <nickname> - subscribe to user\n".
+                           "groups - lists the groups you have joined\n".
+                           "subscriptions - list the people you follow\n".
+                           "subscribers - list the people that follow you\n".
                            "leave <nickname> - unsubscribe from user\n".
                            "d <nickname> <text> - direct message to user\n".
                            "get <nickname> - get last notice from user\n".
diff --git a/lib/commandinterpreter.php b/lib/commandinterpreter.php
index d878fe268..665015afc 100644
--- a/lib/commandinterpreter.php
+++ b/lib/commandinterpreter.php
@@ -47,6 +47,24 @@ class CommandInterpreter
             } else {
                 return new LoginCommand($user);
             }
+         case 'subscribers':
+            if ($arg) {
+                return null;
+            } else {
+                return new SubscribersCommand($user);
+            }
+         case 'subscriptions':
+            if ($arg) {
+                return null;
+            } else {
+                return new SubscriptionsCommand($user);
+            }
+         case 'groups':
+            if ($arg) {
+                return null;
+            } else {
+                return new GroupsCommand($user);
+            }
          case 'on':
             if ($arg) {
                 list($other, $extra) = $this->split_arg($arg);
diff --git a/lib/common.php b/lib/common.php
index 4524d50fa..063d7d9d9 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -45,6 +45,14 @@ define('FOREIGN_FRIEND_RECV', 2);
 
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib/');
 
+# To protect against upstream libraries which haven't updated
+# for PHP 5.3 where dl() function may not be present...
+if (!function_exists('dl')) {
+    function dl($library) {
+        return false;
+    }
+}
+
 # global configuration object
 
 require_once('PEAR.php');
diff --git a/lib/mailbox.php b/lib/mailbox.php
index e1d384a06..90a58b4c4 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -282,7 +282,7 @@ class MailboxAction extends CurrentUserDesignAction
                                     $ns->name);
                 $this->elementEnd('span');
             } else {
-                $this->out->element('span', 'device', $source_name);
+                $this->element('span', 'device', $source_name);
             }
             break;
         }
diff --git a/lib/schema.php b/lib/schema.php
index 1e0c1f3e9..560884d9f 100644
--- a/lib/schema.php
+++ b/lib/schema.php
@@ -373,6 +373,26 @@ class Schema
     }
 
     /**
+     * Ensures that the table that backs a given
+     * Plugin_DataObject class exists.
+     *
+     * If the table does not yet exist, it will
+     * create the table. If it does exist, it will
+     * alter the table to match the column definitions.
+     *
+     * @param Plugin_DataObject $dataObjectClass
+     *
+     * @return boolean success flag
+     */
+
+    public function ensureDataObject($dataObjectClass)
+    {
+        $obj = new $dataObjectClass();
+        $tableDef = $obj->tableDef();
+        return $this->ensureTable($tableDef->name,$tableDef->columns);
+    }
+
+    /**
      * Ensures that a table exists with the given
      * name and the given column definitions.
      *
@@ -544,6 +564,19 @@ class TableDef
     public $name;
     /** array of ColumnDef objects for the columns. */
     public $columns;
+    
+    /**
+     * Constructor.
+     *
+     * @param string  $name     name of the table
+     * @param array   $columns  columns in the table
+     */
+
+    function __construct($name=null,$columns=null)
+    {
+        $this->name = $name;
+        $this->columns = $columns;
+    }
 }
 
 /**
@@ -576,6 +609,8 @@ class ColumnDef
     /** 'extra' stuff. Returned by MySQL, largely
      * unused. */
     public $extra;
+    /** auto increment this field if no value is specific for it during an insert **/
+    public $auto_increment;
 
     /**
      * Constructor.
@@ -591,7 +626,7 @@ class ColumnDef
 
     function __construct($name=null, $type=null, $size=null,
                          $nullable=true, $key=null, $default=null,
-                         $extra=null)
+                         $extra=null, $auto_increment=false)
     {
         $this->name     = strtolower($name);
         $this->type     = strtolower($type);
@@ -600,6 +635,7 @@ class ColumnDef
         $this->key      = $key;
         $this->default  = $default;
         $this->extra    = $extra;
+        $this->auto_increment = $auto_increment;
     }
 
     /**
@@ -617,7 +653,8 @@ class ColumnDef
                 $this->_typeMatch($other) &&
                 $this->_defaultMatch($other) &&
                 $this->_nullMatch($other) &&
-                $this->key == $other->key);
+                $this->key == $other->key &&
+                $this->auto_increment == $other->auto_increment);
     }
 
     /**
diff --git a/locale/ar/LC_MESSAGES/statusnet.mo b/locale/ar/LC_MESSAGES/statusnet.mo
index a6b411e4d..9d156ce91 100644
--- a/locale/ar/LC_MESSAGES/statusnet.mo
+++ b/locale/ar/LC_MESSAGES/statusnet.mo
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index af80e9c9c..8cbdb40b1 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:15+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:46+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\n"
@@ -204,7 +204,7 @@ msgstr ""
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
-msgstr ""
+msgstr "رسائل مباشرة من %s"
 
 #: actions/apidirectmessage.php:93
 #, php-format
@@ -253,7 +253,7 @@ msgstr "تعذّر إنشاء مفضلة."
 
 #: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite!"
-msgstr ""
+msgstr "تلك الحالة ليست مفضلة!"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
 msgid "Could not delete favorite."
@@ -352,7 +352,7 @@ msgstr ""
 #: actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
-msgstr ""
+msgstr "كنية غير صالحة: \"%s\""
 
 #: actions/apigroupcreate.php:321 actions/editgroup.php:228
 #: actions/newgroup.php:172
@@ -688,7 +688,7 @@ msgstr "نعم"
 #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
 #: lib/blockform.php:153
 msgid "Block this user"
-msgstr ""
+msgstr "امنع هذا المستخدم"
 
 #: actions/block.php:165
 msgid "You have already blocked this user."
@@ -1060,7 +1060,7 @@ msgstr ""
 
 #: actions/favor.php:92 lib/disfavorform.php:140
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "ألغِ تفضيل المفضلة"
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1768,11 +1768,11 @@ msgstr ""
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr ""
+msgstr "أرسل التنبيه"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr ""
+msgstr "أُرسل التنبيه!"
 
 #: actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
@@ -1822,11 +1822,11 @@ msgstr "قصّر المسارات بـ"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
-msgstr ""
+msgstr "خدمة التقصير المطلوب استخدامها."
 
 #: actions/othersettings.php:122
 msgid "View profile designs"
-msgstr ""
+msgstr "اعرض تصاميم الملف الشخصي"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
@@ -2118,6 +2118,10 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/).  [انضم "
+"الآن](%%action.register%%) لتشارك اشعاراتك مع أصدقائك وعائلتك وزملائك! "
+"([اقرأ المزيد](%%doc.help%%))"
 
 #: actions/public.php:238
 #, php-format
@@ -2126,10 +2130,12 @@ msgid ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
+"هنا %%site.name%%، خدمة [التدوين المُصغّر](http://en.wikipedia.org/wiki/Micro-"
+"blogging) المبنية على البرنامج الحر [StatusNet](http://status.net/)."
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
-msgstr ""
+msgstr "سحابة الوسوم العمومية"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -2536,7 +2542,7 @@ msgstr ""
 
 #: actions/showfavorites.php:242
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "إنها إحدى وسائل مشاركة ما تحب."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
@@ -2641,7 +2647,7 @@ msgstr "لا رسالة كهذه."
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "يحق للمُرسل والمستلم فقط قراءة هذه الرسالة."
 
 #: actions/showmessage.php:108
 #, php-format
@@ -2884,12 +2890,12 @@ msgstr "اشتراكات %s، الصفحة %d"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
-msgstr ""
+msgstr "هؤلاء الأشخاص الذي تستمع إليهم."
 
 #: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr ""
+msgstr "هؤلاء الأشخاص الذي يستمع %s إليهم."
 
 #: actions/subscriptions.php:121
 #, php-format
@@ -3381,6 +3387,9 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"تعمل على برنامج التدوين المُصغّر [StatusNet](http://status.net/) -النسخة %s- "
+"المتوفر تحت [رخصة غنو أفيرو العمومية](http://www.fsf.org/licensing/licenses/"
+"agpl-3.0.html)."
 
 #: lib/action.php:785
 msgid "Site content license"
@@ -3394,19 +3403,19 @@ msgstr ""
 msgid "license."
 msgstr "الرخصة."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "بعد"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "قبل"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3579,13 +3588,46 @@ msgstr ""
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "لا تملك تصريحًا."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "الأشخاص الذين اشترك بهم %s"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "الأشخاص المشتركون ب%s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "لست عضوا في تلك المجموعة."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "لست عضوا في تلك المجموعة."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3615,19 +3657,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr ""
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr "اذهب إلى المُثبّت."
 
@@ -4191,11 +4233,11 @@ msgstr "رُد"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr ""
+msgstr "نبّه هذا المستخدم"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr ""
+msgstr "نبّه"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
diff --git a/locale/bg/LC_MESSAGES/statusnet.mo b/locale/bg/LC_MESSAGES/statusnet.mo
index 518f6949a..48af8295b 100644
--- a/locale/bg/LC_MESSAGES/statusnet.mo
+++ b/locale/bg/LC_MESSAGES/statusnet.mo
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index c47a06d3d..c4930c6ff 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:18+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:49+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -3601,19 +3601,19 @@ msgstr "Всички "
 msgid "license."
 msgstr "лиценз."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Страниране"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "След"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Преди"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Имаше проблем със сесията ви в сайта."
 
@@ -3787,13 +3787,46 @@ msgstr "Грешка при създаване на OpenID форма: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Не сте абонирани за този профил"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Не сте абонирани за този профил"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Грешка при абониране на друг потребител за вас."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Абонирани за %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Не членувате в тази група."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Не членувате в тази група."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3823,20 +3856,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Няма код за потвърждение."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Влизане в сайта"
diff --git a/locale/ca/LC_MESSAGES/statusnet.mo b/locale/ca/LC_MESSAGES/statusnet.mo
index c52451e28..cd6cf878e 100644
--- a/locale/ca/LC_MESSAGES/statusnet.mo
+++ b/locale/ca/LC_MESSAGES/statusnet.mo
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index c76ac05a3..417607800 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:21+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:52+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -3635,19 +3635,19 @@ msgstr "Tot "
 msgid "license."
 msgstr "llicència."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginació"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Posteriors"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Anteriors"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Ha ocorregut algun problema amb la teva sessió."
 
@@ -3819,13 +3819,46 @@ msgstr "No s'ha pogut crear el formulari OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "No estàs subscrit a aquest perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "No estàs subscrit a aquest perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "No pots subscriure a un altre a tu mateix."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Persones subscrites a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "No ets membre d'aquest grup."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "No ets membre d'aquest grup."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3855,20 +3888,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Cap codi de confirmació."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Accedir a aquest lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.mo b/locale/cs/LC_MESSAGES/statusnet.mo
index e3141e70a..449e93cdc 100644
--- a/locale/cs/LC_MESSAGES/statusnet.mo
+++ b/locale/cs/LC_MESSAGES/statusnet.mo
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 36e0f1c40..6bba1da17 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:23+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:42:56+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
@@ -3547,21 +3547,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« Novější"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Starší »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3733,13 +3733,46 @@ msgstr "Nelze vytvořit OpenID z: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Neodeslal jste nám profil"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Neodeslal jste nám profil"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Vzdálený odběr"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Vzdálený odběr"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Neodeslal jste nám profil"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Neodeslal jste nám profil"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3769,20 +3802,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Žádný potvrzující kód."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/de/LC_MESSAGES/statusnet.mo b/locale/de/LC_MESSAGES/statusnet.mo
index b5c2ef5d0..358fc5be4 100644
--- a/locale/de/LC_MESSAGES/statusnet.mo
+++ b/locale/de/LC_MESSAGES/statusnet.mo
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 93ce64cd5..4480f68c1 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:26+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:12+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -3647,19 +3647,19 @@ msgstr "Alle "
 msgid "license."
 msgstr "Lizenz."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Später"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Vorher"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -3831,13 +3831,46 @@ msgstr "Konnte OpenID-Formular nicht erstellen: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Du hast dieses Profil nicht abonniert."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Du hast dieses Profil nicht abonniert."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Die Gegenseite konnte Dich nicht abonnieren."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Leute, die %s abonniert haben"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du bist kein Mitglied dieser Gruppe."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3867,20 +3900,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Kein Bestätigungs-Code."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Auf der Seite anmelden"
diff --git a/locale/el/LC_MESSAGES/statusnet.mo b/locale/el/LC_MESSAGES/statusnet.mo
index 69dc7b9c4..464aca5ea 100644
--- a/locale/el/LC_MESSAGES/statusnet.mo
+++ b/locale/el/LC_MESSAGES/statusnet.mo
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 1b97f591c..f8fa1eb63 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:28+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:15+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -3499,19 +3499,19 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr ""
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3681,13 +3681,44 @@ msgstr "Αδυναμία δημιουργίας φόρμας OpenID: %s "
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Δεν επιτρέπεται να κάνεις συνδρομητές του λογαριασμού σου άλλους."
+
+#: lib/command.php:639
+msgid "These people are subscribed to you: "
+msgstr ""
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Ομάδες με τα περισσότερα μέλη"
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
+msgstr ""
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3717,20 +3748,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Ο κωδικός επιβεβαίωσης δεν βρέθηκε."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.mo b/locale/en_GB/LC_MESSAGES/statusnet.mo
index 7998fbcf0..33531f33c 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.mo
+++ b/locale/en_GB/LC_MESSAGES/statusnet.mo
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 27fd82b70..c65fc1c73 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:31+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:18+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -3586,19 +3586,19 @@ msgstr "All "
 msgid "license."
 msgstr "licence."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Pagination"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "After"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Before"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "There was a problem with your session token."
 
@@ -3770,13 +3770,46 @@ msgstr "Could not create OpenID from: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "You are not subscribed to that profile."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "You are not subscribed to that profile."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Could not subscribe other to you."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "People subscribed to %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "You are not a member of that group."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "You are not a member of that group."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3806,19 +3839,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr "No configuration file found"
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Login to the site"
diff --git a/locale/es/LC_MESSAGES/statusnet.mo b/locale/es/LC_MESSAGES/statusnet.mo
index 366d16819..7bc7cf1b6 100644
--- a/locale/es/LC_MESSAGES/statusnet.mo
+++ b/locale/es/LC_MESSAGES/statusnet.mo
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index 1315f017c..aa34e255c 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 #
 # Author@translatewiki.net: Brion
 # Author@translatewiki.net: Crazymadlover
+# Author@translatewiki.net: Translationista
 # --
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -12,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:34+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:21+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -156,6 +157,8 @@ msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
 msgstr ""
+"El servidor no ha podido manejar tanta información del tipo POST (% de "
+"bytes) a causa de su configuración actual."
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:136
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -3661,19 +3664,19 @@ msgstr "Todo"
 msgid "license."
 msgstr "Licencia."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginación"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Después"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Antes"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Hubo problemas con tu clave de sesión."
 
@@ -3845,13 +3848,46 @@ msgstr "No se pudo crear el formulario OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "No estás suscrito a ese perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "No estás suscrito a ese perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "No se pudo suscribir otro a ti."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Personas suscritas a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "No eres miembro de ese grupo"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "No eres miembro de este grupo."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3881,19 +3917,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr "Ningún archivo de configuración encontrado. "
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr "Ir al instalador."
 
diff --git a/locale/fi/LC_MESSAGES/statusnet.mo b/locale/fi/LC_MESSAGES/statusnet.mo
index 9cd1fdbfa..14026dc1e 100644
--- a/locale/fi/LC_MESSAGES/statusnet.mo
+++ b/locale/fi/LC_MESSAGES/statusnet.mo
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index db933a25b..c75267286 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:37+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:24+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
@@ -83,6 +83,8 @@ msgstr "Käyttäjän %s kavereiden syöte (Atom)"
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
+"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
+"vielä mitään."
 
 #: actions/all.php:132
 #, php-format
@@ -90,6 +92,8 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"Kokeile useamman käyttäjän tilaamista, [liity ryhmään] (%%action.groups%%) "
+"tai lähetä päivitys itse."
 
 #: actions/all.php:134
 #, php-format
@@ -641,9 +645,8 @@ msgid "%s blocked profiles, page %d"
 msgstr "%s ja kaverit, sivu %d"
 
 #: actions/blockedfromgroup.php:108
-#, fuzzy
 msgid "A list of the users blocked from joining this group."
-msgstr "Lista ryhmän käyttäjistä."
+msgstr "Lista käyttäjistä jotka ovat estetty liittymästä tähän ryhmään."
 
 #: actions/blockedfromgroup.php:281
 msgid "Unblock user from group"
@@ -695,9 +698,8 @@ msgid "No"
 msgstr "Ei"
 
 #: actions/block.php:149
-#, fuzzy
 msgid "Do not block this user"
-msgstr "Poista esto tältä käyttäjältä"
+msgstr "Älä estä tätä käyttäjää"
 
 #: actions/block.php:150 actions/deletenotice.php:146
 #: actions/groupblock.php:179
@@ -1082,9 +1084,9 @@ msgid "%s's favorite notices"
 msgstr "Käyttäjän %s suosikkipäivitykset"
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1181,7 +1183,7 @@ msgstr "Ryhmää ei ole määritelty."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
-msgstr ""
+msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä."
 
 #: actions/groupblock.php:95
 #, fuzzy
@@ -1189,14 +1191,12 @@ msgid "User is already blocked from group."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
 #: actions/groupblock.php:100
-#, fuzzy
 msgid "User is not a member of group."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Käyttäjä ei kuulu tähän ryhmään."
 
 #: actions/groupblock.php:136 actions/groupmembers.php:314
-#, fuzzy
 msgid "Block user from group"
-msgstr "Estä käyttäjä"
+msgstr "Estä käyttäjä ryhmästä"
 
 #: actions/groupblock.php:162
 #, php-format
@@ -1228,9 +1228,8 @@ msgstr ""
 "Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #: actions/groupdesignsettings.php:141
-#, fuzzy
 msgid "Group design"
-msgstr "Ryhmät"
+msgstr "Ryhmän ulkoasu"
 
 #: actions/groupdesignsettings.php:152
 msgid ""
@@ -1240,21 +1239,18 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
 #: lib/designsettings.php:434 lib/designsettings.php:464
-#, fuzzy
 msgid "Couldn't update your design."
-msgstr "Ei voitu päivittää käyttäjää."
+msgstr "Ei voitu päivittää sinun sivusi ulkoasua."
 
 #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
 msgid "Unable to save your design settings!"
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
+msgstr "Ei voitu tallentaa sinun ulkoasuasetuksia!"
 
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
-msgstr "Synkronointiasetukset tallennettiin."
+msgstr "Ulkoasuasetukset tallennettu."
 
 #: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
@@ -1305,18 +1301,17 @@ msgid "Make user an admin of the group"
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #: actions/groupmembers.php:473
-#, fuzzy
 msgid "Make Admin"
-msgstr "Ylläpito"
+msgstr "Tee ylläpitäjäksi"
 
 #: actions/groupmembers.php:473
 msgid "Make this user an admin"
 msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #: actions/grouprss.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Ryhmän  %1$s käyttäjien päivitykset palvelussa %2$s!"
 
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
@@ -1380,9 +1375,8 @@ msgid "Only an admin can unblock group members."
 msgstr "Vain ylläpitäjä voi poistaa eston ryhmän jäseniltä."
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "Käyttäjä on asettanut eston sinulle."
+msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #: actions/groupunblock.php:128 actions/unblock.php:108
 msgid "Error removing the block."
@@ -1402,9 +1396,8 @@ msgstr ""
 "im%%) käyttäen. Alla voit määrittää osoitteesi ja asetuksesi. "
 
 #: actions/imsettings.php:89
-#, fuzzy
 msgid "IM is not available."
-msgstr "Tämä sivu ei ole saatavilla "
+msgstr "Pikaviestin ei ole käytettävissä."
 
 #: actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
@@ -1501,7 +1494,7 @@ msgstr "Tämä on postilaatikkosi, jossa on sinulle saapuneet yksityisviestit."
 
 #: actions/invite.php:39
 msgid "Invites have been disabled."
-msgstr ""
+msgstr "Kutsut ovat pois käytöstä."
 
 #: actions/invite.php:41
 #, php-format
@@ -1751,22 +1744,22 @@ msgstr ""
 
 #: actions/makeadmin.php:91
 msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän."
 
 #: actions/makeadmin.php:95
 #, php-format
 msgid "%s is already an admin for group \"%s\"."
-msgstr ""
+msgstr "%s on jo ryhmän \"%s\" ylläpitäjä."
 
 #: actions/makeadmin.php:132
 #, php-format
 msgid "Can't get membership record for %s in group %s"
-msgstr ""
+msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s"
 
 #: actions/makeadmin.php:145
 #, php-format
 msgid "Can't make %s an admin for group %s"
-msgstr ""
+msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
 
 #: actions/microsummary.php:69
 msgid "No current status"
@@ -1847,6 +1840,8 @@ msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
+"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
+"newnotice%%%%?status_textarea=%s)!"
 
 #: actions/noticesearch.php:124
 #, php-format
@@ -1938,7 +1933,7 @@ msgstr "Profiiliasetukset"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Näytä tai piillota profiilin ulkoasu."
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
@@ -2221,7 +2216,7 @@ msgstr ""
 
 #: actions/public.php:182
 msgid "Be the first to post!"
-msgstr ""
+msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
 #: actions/public.php:186
 #, php-format
@@ -2261,10 +2256,12 @@ msgstr "Nämä ovat suosituimmat viimeaikaiset tagit %s -palvelussa"
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
+"Kukaan ei ole vielä lähettänyt päivitystä tagilla [hashtag] (%%doc.tags%%) "
+"vielä."
 
 #: actions/publictagcloud.php:72
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "Ole ensimmäinen joka lähettää päivityksen!"
 
 #: actions/publictagcloud.php:75
 #, php-format
@@ -2313,11 +2310,11 @@ msgstr ""
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
 
 #: actions/recoverpassword.php:188
 msgid "Password recovery"
-msgstr ""
+msgstr "Salasanan palautus"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
@@ -2406,9 +2403,8 @@ msgid "Sorry, only invited people can register."
 msgstr "Valitettavasti vain kutsutut ihmiset voivat rekisteröityä."
 
 #: actions/register.php:92
-#, fuzzy
 msgid "Sorry, invalid invitation code."
-msgstr "Virhe vahvistuskoodin kanssa."
+msgstr "Virheellinen kutsukoodin."
 
 #: actions/register.php:112
 msgid "Registration successful"
@@ -2485,12 +2481,11 @@ msgid "Creative Commons Attribution 3.0"
 msgstr ""
 
 #: actions/register.php:496
-#, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
 msgstr ""
-" poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
+"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM osoite, "
 "puhelinnumero."
 
 #: actions/register.php:537
@@ -2551,9 +2546,8 @@ msgid "Remote subscribe"
 msgstr "Etätilaus"
 
 #: actions/remotesubscribe.php:124
-#, fuzzy
 msgid "Subscribe to a remote user"
-msgstr "Tilaa tämä käyttäjä"
+msgstr "Tilaa tämä etäkäyttäjä"
 
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
@@ -2589,13 +2583,11 @@ msgstr ""
 "löytynyt)."
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 "Tämä on paikallinen profiili. Kirjaudu sisään, jotta voit tilata päivitykset."
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
 msgstr "Ei saatu request tokenia."
 
@@ -2726,26 +2718,26 @@ msgstr "Huomaa"
 
 #: actions/showgroup.php:284 lib/groupeditform.php:184
 msgid "Aliases"
-msgstr ""
+msgstr "Aliakset"
 
 #: actions/showgroup.php:293
 msgid "Group actions"
 msgstr "Ryhmän toiminnot"
 
 #: actions/showgroup.php:328
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Päivityssyöte ryhmälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #: actions/showgroup.php:334
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Päivityssyöte ryhmälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
 #: actions/showgroup.php:340
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "Päivityssyöte ryhmälle %s"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #: actions/showgroup.php:345
 #, php-format
@@ -2796,9 +2788,8 @@ msgstr ""
 "(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showgroup.php:482
-#, fuzzy
 msgid "Admins"
-msgstr "Ylläpito"
+msgstr "Ylläpitäjät"
 
 #: actions/showmessage.php:81
 msgid "No such message."
@@ -2819,9 +2810,8 @@ msgid "Message from %1$s on %2$s"
 msgstr "Viesti käyttäjältä %1$s, %2$s"
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "Päivitys lähetetty"
+msgstr "Päivitys on poistettu."
 
 #: actions/showstream.php:73
 #, fuzzy, php-format
@@ -2862,6 +2852,8 @@ msgstr "Käyttäjän %s lähetetyt viestit"
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
 msgstr ""
+"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään "
+"päivitystä."
 
 #: actions/showstream.php:196
 msgid ""
@@ -2906,9 +2898,8 @@ msgstr ""
 "Voit saada SMS viestit sähköpostin välityksellä %%site.name%% -palvelusta."
 
 #: actions/smssettings.php:91
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Tämä sivu ei ole saatavilla "
+msgstr "SMS ei ole käytettävissä."
 
 #: actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
@@ -2959,13 +2950,12 @@ msgid "That phone number already belongs to another user."
 msgstr "Tämä puhelinnumero kuuluu jo toiselle käyttäjälle."
 
 #: actions/smssettings.php:347
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 "Vahvistuskoodi on lähetetty puhelinnumeroosi. Katso tekstiviesteistäsi "
-"vahvistuskoodisi ja miten sitä käytetään. "
+"vahvistuskoodisi ja ohjeet miten sitä käytetään."
 
 #: actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
@@ -3080,9 +3070,9 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s seuraa nyt käyttäjää"
+msgstr "%s ei seuraa ketään käyttäjää."
 
 #: actions/subscriptions.php:194
 msgid "Jabber"
@@ -3203,9 +3193,8 @@ msgstr ""
 "paina \"Peruuta\"."
 
 #: actions/userauthorization.php:188
-#, fuzzy
 msgid "License"
-msgstr "lisenssi."
+msgstr "Lisenssi"
 
 #: actions/userauthorization.php:209
 msgid "Accept"
@@ -3606,19 +3595,19 @@ msgstr "Kaikki "
 msgid "license."
 msgstr "lisenssi."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Sivutus"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Myöhemmin"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Aiemmin"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
@@ -3790,13 +3779,46 @@ msgstr "Ei voitu luoda OpenID lomaketta: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Toista ei voitu asettaa tilaamaan sinua."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Ihmiset jotka ovat käyttäjän %s tilaajia"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3826,20 +3848,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Varmistuskoodia ei ole annettu."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Kirjaudu sisään palveluun"
diff --git a/locale/fr/LC_MESSAGES/statusnet.mo b/locale/fr/LC_MESSAGES/statusnet.mo
index 1549319bb..6328e2ed9 100644
--- a/locale/fr/LC_MESSAGES/statusnet.mo
+++ b/locale/fr/LC_MESSAGES/statusnet.mo
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 70d66e8eb..62ffbe99f 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to French
 #
 # Author@translatewiki.net: IAlex
+# Author@translatewiki.net: Isoph
 # Author@translatewiki.net: Jean-Frédéric
 # Author@translatewiki.net: Peter17
 # Author@translatewiki.net: Zetud
@@ -9,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:39+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:27+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -80,6 +81,8 @@ msgstr "Flux pour les amis de %s (Atom)"
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
+"Ceci est le flux pour %s et ses amis mais personne n’a rien posté pour le "
+"moment."
 
 #: actions/all.php:132
 #, php-format
@@ -87,6 +90,8 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"Essayez de vous abonner à plus d’utilisateurs, de vous [inscrire à un groupe]"
+"(%%action.groups%%) ou de publier quelque chose vous-même."
 
 #: actions/all.php:134
 #, php-format
@@ -116,7 +121,6 @@ msgstr "Statuts de %1$s et ses amis dans %2$s!"
 #: actions/apiaccountupdateprofilebackgroundimage.php:94
 #: actions/apiaccountupdateprofilecolors.php:118
 #: actions/apiaccountupdateprofile.php:97
-#, fuzzy
 msgid "API method not found."
 msgstr "Méthode API non trouvée !"
 
@@ -140,9 +144,8 @@ msgid ""
 msgstr ""
 
 #: actions/apiaccountupdatedeliverydevice.php:132
-#, fuzzy
 msgid "Could not update user."
-msgstr "Impossible de mettre à jour l'utilisateur."
+msgstr "Impossible de mettre à jour l’utilisateur."
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97
@@ -158,15 +161,13 @@ msgstr ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
 #: actions/apiaccountupdateprofilecolors.php:164
 #: actions/apiaccountupdateprofilecolors.php:174
-#, fuzzy
 msgid "Unable to save your design settings."
-msgstr "L'enregistrement de votre configuration Twitter a échoué !"
+msgstr "Impossible de sauvegarder les parmètres de la conception."
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
 msgid "Could not update your design."
-msgstr "Impossible de mettre à jour l'utilisateur."
+msgstr "Impossible de mettre à jour votre conception."
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -178,17 +179,16 @@ msgid "User has no profile."
 msgstr "Aucun profil ne correspond à cet utilisateur."
 
 #: actions/apiaccountupdateprofile.php:147
-#, fuzzy
 msgid "Could not save profile."
-msgstr "Impossible d'enregistrer le profil."
+msgstr "Impossible d’enregistrer le profil."
 
 #: actions/apiblockcreate.php:108
 msgid "Block user failed."
-msgstr "Le blocage de l'utilisateur a échoué."
+msgstr "Le blocage de l’utilisateur a échoué."
 
 #: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
-msgstr "Le déblocage de l'utilisateur a échoué."
+msgstr "Le déblocage de l’utilisateur a échoué."
 
 #: actions/apidirectmessagenew.php:126
 msgid "No message text!"
@@ -197,7 +197,7 @@ msgstr "Message sans texte !"
 #: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "C'est trop long ! La taille maximale du message est de %d caractères."
+msgstr "C’est trop long ! La taille maximale du message est de %d caractères."
 
 #: actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
@@ -206,7 +206,7 @@ msgstr "Destinataire non trouvé."
 #: actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
-"Vous ne pouvez envoyer des messages personnels qu'aux utilisateurs inscrits "
+"Vous ne pouvez envoyer des messages personnels qu’aux utilisateurs inscrits "
 "comme amis."
 
 #: actions/apidirectmessage.php:89
@@ -261,7 +261,7 @@ msgstr "Impossible de créer le favori."
 
 #: actions/apifavoritedestroy.php:122
 msgid "That status is not a favorite!"
-msgstr "Ce statut n'est pas un favori !"
+msgstr "Ce statut n’est pas un favori !"
 
 #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
 msgid "Could not delete favorite."
@@ -269,20 +269,20 @@ msgstr "Impossible de supprimer le favori."
 
 #: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
-msgstr "Impossible de suivre l'utilisateur : Utilisateur non trouvé."
+msgstr "Impossible de suivre l’utilisateur : Utilisateur non trouvé."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "Impossible de suivre l'utilisateur : %s est déjà dans votre liste."
+msgstr "Impossible de suivre l’utilisateur : %s est déjà dans votre liste."
 
 #: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
-msgstr "Impossible de ne plus suivre l'utilisateur : utilisateur non trouvé."
+msgstr "Impossible de ne plus suivre l’utilisateur : utilisateur non trouvé."
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself!"
-msgstr ""
+msgstr "Vous ne pouvez pas ne plus vous suivre vous-même !"
 
 #: actions/apifriendshipsexists.php:94
 msgid "Two user ids or screen_names must be supplied."
@@ -290,11 +290,11 @@ msgstr "Vous devez fournir 2 identifiants ou pseudos."
 
 #: actions/apifriendshipsshow.php:135
 msgid "Could not determine source user."
-msgstr "Impossible de déterminer l'utilisateur source."
+msgstr "Impossible de déterminer l’utilisateur source."
 
 #: actions/apifriendshipsshow.php:143
 msgid "Could not find target user."
-msgstr "Impossible de trouver l'utilisateur cible."
+msgstr "Impossible de trouver l’utilisateur cible."
 
 #: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
@@ -307,7 +307,7 @@ msgstr "Impossible de créer les alias."
 
 #: actions/apigroupcreate.php:166 actions/newgroup.php:224
 msgid "Could not set group membership."
-msgstr "Impossible d'établir l'inscription au groupe."
+msgstr "Impossible d'établir l’inscription au groupe."
 
 #: actions/apigroupcreate.php:212 actions/editgroup.php:182
 #: actions/newgroup.php:126 actions/profilesettings.php:208
@@ -333,7 +333,7 @@ msgstr "Pseudo invalide."
 #: actions/newgroup.php:139 actions/profilesettings.php:215
 #: actions/register.php:217
 msgid "Homepage is not a valid URL."
-msgstr "L'adresse du site personnel n'est pas un URL valide. "
+msgstr "L’adresse du site personnel n’est pas un URL valide. "
 
 #: actions/apigroupcreate.php:253 actions/editgroup.php:198
 #: actions/newgroup.php:142 actions/profilesettings.php:218
@@ -356,7 +356,7 @@ msgstr "Emplacement trop long (maximum de 255 caractères)."
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
-msgstr ""
+msgstr "Trop d’alias ! Maximum %d."
 
 #: actions/apigroupcreate.php:312 actions/editgroup.php:224
 #: actions/newgroup.php:168
@@ -373,7 +373,7 @@ msgstr "Alias « %s » déjà utilisé. Essayez-en un autre."
 #: actions/apigroupcreate.php:334 actions/editgroup.php:234
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
-msgstr ""
+msgstr "L’alias ne peut pas être le même que le pseudo."
 
 #: actions/apigroupjoin.php:110
 msgid "You are already a member of that group."
@@ -381,12 +381,12 @@ msgstr "Vous êtes déjà membre de ce groupe."
 
 #: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
 #: actions/apigroupjoin.php:138
 #, php-format
 msgid "Could not join user %s to group %s."
-msgstr "Impossible de joindre l'utilisateur %s au groupe %s."
+msgstr "Impossible de joindre l’utilisateur %s au groupe %s."
 
 #: actions/apigroupleave.php:114
 msgid "You are not a member of this group."
@@ -395,7 +395,7 @@ msgstr "Vous n'êtes pas membre de ce groupe."
 #: actions/apigroupleave.php:124
 #, php-format
 msgid "Could not remove user %s to group %s."
-msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
+msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 
 #: actions/apigrouplistall.php:90 actions/usergroups.php:62
 #, php-format
@@ -423,7 +423,7 @@ msgstr "Ce processus requiert un POST ou un DELETE."
 
 #: actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
-msgstr "Vous ne pouvez pas supprimer le statut d'un autre utilisateur."
+msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 
 #: actions/apistatusesshow.php:138
 msgid "Status deleted."
@@ -437,7 +437,7 @@ msgstr "Aucun statut trouvé avec cet identifiant."
 #: scripts/maildaemon.php:71
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "C'est trop long ! La taille maximale de l'avis est de %d caractères."
+msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères."
 
 #: actions/apistatusesupdate.php:198
 msgid "Not found"
@@ -447,6 +447,8 @@ msgstr "Non trouvé"
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
+"La taille maximale du statut est de %d caractères, en incluant l’URL de la "
+"pièce jointe."
 
 #: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
 msgid "Unsupported format."
@@ -545,7 +547,7 @@ msgstr "Utilisateur sans profil correspondant"
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:194
 #: actions/grouplogo.php:251
 msgid "Avatar settings"
-msgstr "Paramètres de l'avatar"
+msgstr "Paramètres de l’avatar"
 
 #: actions/avatarsettings.php:126 actions/avatarsettings.php:202
 #: actions/grouplogo.php:199 actions/grouplogo.php:259
@@ -607,7 +609,7 @@ msgstr "Avatar mis à jour."
 
 #: actions/avatarsettings.php:363
 msgid "Failed updating avatar."
-msgstr "La mise à jour de l'avatar a échoué."
+msgstr "La mise à jour de l’avatar a échoué."
 
 #: actions/avatarsettings.php:387
 msgid "Avatar deleted."
@@ -639,11 +641,11 @@ msgstr "%s profils bloqués, page %d"
 
 #: actions/blockedfromgroup.php:108
 msgid "A list of the users blocked from joining this group."
-msgstr "Une liste des utilisateurs dont l'inscription à ce groupe est bloquée."
+msgstr "Une liste des utilisateurs dont l’inscription à ce groupe est bloquée."
 
 #: actions/blockedfromgroup.php:281
 msgid "Unblock user from group"
-msgstr "Débloquer l'utilisateur du groupe"
+msgstr "Débloquer l’utilisateur du groupe"
 
 #: actions/blockedfromgroup.php:313 lib/unblockform.php:150
 msgid "Unblock"
@@ -666,7 +668,7 @@ msgstr "Non connecté."
 #: actions/block.php:69 actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46 actions/unblock.php:70
 msgid "No profile specified."
-msgstr "Aucun profil n'a été spécifié."
+msgstr "Aucun profil n’a été spécifié."
 
 #: actions/block.php:74 actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
@@ -705,7 +707,7 @@ msgstr "Oui"
 #: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123
 #: lib/blockform.php:153
 msgid "Block this user"
-msgstr "Bloquer cet utilisateur "
+msgstr "Bloquer cet utilisateur"
 
 #: actions/block.php:165
 msgid "You have already blocked this user."
@@ -713,11 +715,11 @@ msgstr "Vous avez déjà bloqué cet utilisateur."
 
 #: actions/block.php:170
 msgid "Failed to save block information."
-msgstr "Impossible d'enregistrer les informations de blocage."
+msgstr "Impossible d’enregistrer les informations de blocage."
 
 #: actions/bookmarklet.php:50
 msgid "Post to "
-msgstr "Poster sur"
+msgstr "Poster sur "
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -729,12 +731,12 @@ msgstr "Code de confirmation non trouvé."
 
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr "Ce code de confirmation n'est pas pour vous !"
+msgstr "Ce code de confirmation n’est pas pour vous !"
 
 #: actions/confirmaddress.php:90
 #, php-format
 msgid "Unrecognized address type %s"
-msgstr "Type d'adresse non reconnu : %s"
+msgstr "Type d’adresse non reconnu : %s"
 
 #: actions/confirmaddress.php:94
 msgid "That address has already been confirmed."
@@ -746,7 +748,7 @@ msgstr "Cette adresse a déjà été confirmée."
 #: actions/profilesettings.php:276 actions/smssettings.php:278
 #: actions/smssettings.php:420
 msgid "Couldn't update user."
-msgstr "Impossible de mettre à jour l'utilisateur."
+msgstr "Impossible de mettre à jour l’utilisateur."
 
 #: actions/confirmaddress.php:126 actions/emailsettings.php:390
 #: actions/imsettings.php:363 actions/smssettings.php:382
@@ -755,7 +757,7 @@ msgstr "Impossible de supprimer le courriel de confirmation."
 
 #: actions/confirmaddress.php:144
 msgid "Confirm Address"
-msgstr "Confirmer l'adresse"
+msgstr "Confirmer l’adresse"
 
 #: actions/confirmaddress.php:159
 #, php-format
@@ -773,7 +775,7 @@ msgstr "Statuts"
 
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
-msgstr "Statut non trouvé. "
+msgstr "Statut non trouvé."
 
 #: actions/deletenotice.php:71
 msgid "Can't delete this notice."
@@ -785,7 +787,7 @@ msgid ""
 "be undone."
 msgstr ""
 "Vous êtes sur le point de supprimer définitivement un message. Une fois cela "
-"fait, il est impossible de l'annuler."
+"fait, il est impossible de l’annuler."
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -804,7 +806,6 @@ msgid "Delete this notice"
 msgstr "Supprimer ce statut"
 
 #: actions/deletenotice.php:157
-#, fuzzy
 msgid "There was a problem with your session token.  Try again, please."
 msgstr ""
 "Un problème est survenu avec votre jeton de session. Veuillez essayer à "
@@ -812,7 +813,7 @@ msgstr ""
 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr "Ce statut n'est pas un favori !"
+msgstr "Ce statut n’est pas un favori !"
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
@@ -820,7 +821,7 @@ msgstr "Ajouter aux favoris"
 
 #: actions/doc.php:69
 msgid "No such document."
-msgstr "Document non trouvé. "
+msgstr "Document non trouvé."
 
 #: actions/editgroup.php:56
 #, php-format
@@ -834,7 +835,7 @@ msgstr "Vous devez ouvrir une session pour créer un groupe."
 #: actions/editgroup.php:103 actions/editgroup.php:168
 #: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
-msgstr "Seuls les administrateurs d'un groupe peuvent le modifier."
+msgstr "Seuls les administrateurs d’un groupe peuvent le modifier."
 
 #: actions/editgroup.php:154
 msgid "Use this form to edit the group."
@@ -875,14 +876,14 @@ msgstr "Adresse courriel actuellement confirmée."
 #: actions/imsettings.php:108 actions/smssettings.php:115
 #: actions/smssettings.php:158
 msgid "Remove"
-msgstr "Retirer "
+msgstr "Retirer"
 
 #: actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"En attente d'une confirmation pour cette adresse. Vérifiez votre compte "
+"En attente d’une confirmation pour cette adresse. Vérifiez votre compte "
 "Jabber/GTalk pour recevoir de nouvelles instructions."
 
 #: actions/emailsettings.php:117 actions/imsettings.php:120
@@ -892,11 +893,11 @@ msgstr "Annuler"
 
 #: actions/emailsettings.php:121
 msgid "Email Address"
-msgstr "Adresse courriel"
+msgstr "Adresse de courriel"
 
 #: actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
-msgstr "Adresse courriel (ex : nom@example.org)"
+msgstr "Adresse de courriel (ex : nom@example.org)"
 
 #: actions/emailsettings.php:126 actions/imsettings.php:133
 #: actions/smssettings.php:145
@@ -913,7 +914,7 @@ msgstr "Écrivez à cette adresse courriel pour publier de nouveaux statuts. "
 
 #: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Nouvelle adresse courriel pour poster ; annule l'ancienne."
+msgstr "Nouvelle adresse courriel pour poster ; annule l’ancienne."
 
 #: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
@@ -936,16 +937,15 @@ msgstr ""
 
 #: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
-msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel."
+msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie un message personnel."
 
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Envoyez-moi un courriel quand quelqu'un m'envoie un message personnel."
+msgstr "Envoyez-moi un courriel quand quelqu’un m’envoie une réponse « @ »."
 
 #: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
-msgstr "Autoriser mes amis à m'envoyer des courriels et des clins d'oeil."
+msgstr "Autoriser mes amis à m’envoyer des courriels et des clins d’œil."
 
 #: actions/emailsettings.php:185
 msgid "I want to post notices by email."
@@ -974,7 +974,7 @@ msgstr "Aucune adresse courriel."
 
 #: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
-msgstr "Impossible d'utiliser cette adresse courriel"
+msgstr "Impossible d’utiliser cette adresse courriel"
 
 #: actions/emailsettings.php:330
 msgid "Not a valid email address"
@@ -991,14 +991,14 @@ msgstr "Cette adresse courriel appartient déjà à un autre utilisateur."
 #: actions/emailsettings.php:352 actions/imsettings.php:317
 #: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
-msgstr "Impossible d'insérer le code de confirmation."
+msgstr "Impossible d’insérer le code de confirmation."
 
 #: actions/emailsettings.php:358
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"Un code de confirmation a été envoyé à l'adresse courriel indiquée. Vérifiez "
+"Un code de confirmation a été envoyé à l’adresse courriel indiquée. Vérifiez "
 "votre boîte de réception pour récupérer le code et les instructions."
 
 #: actions/emailsettings.php:378 actions/imsettings.php:351
@@ -1017,12 +1017,12 @@ msgstr "Confirmation annulée."
 
 #: actions/emailsettings.php:412
 msgid "That is not your email address."
-msgstr "Ceci n'est pas votre adresse courriel."
+msgstr "Ceci n’est pas votre adresse courriel."
 
 #: actions/emailsettings.php:431 actions/imsettings.php:408
 #: actions/smssettings.php:425
 msgid "The address was removed."
-msgstr "L'adresse a été supprimée."
+msgstr "L’adresse a été supprimée."
 
 #: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
@@ -1031,11 +1031,11 @@ msgstr "Aucune adresse pour le courriel entrant."
 #: actions/emailsettings.php:455 actions/emailsettings.php:477
 #: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
-msgstr "Impossible de mettre à jour le dossier de l'utilisateur."
+msgstr "Impossible de mettre à jour le dossier de l’utilisateur."
 
 #: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
-msgstr "L'adresse de courriel entrant a été supprimée."
+msgstr "L’adresse de courriel entrant a été supprimée."
 
 #: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
@@ -1058,12 +1058,16 @@ msgstr "Statuts les plus populaires sur le site en ce moment."
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 msgstr ""
+"Les statuts favoris apparaissent sur cette page mais personne ne n’en a mis "
+"un en favori actuellement."
 
 #: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
 msgstr ""
+"Soyez le premier à un statut dans vos favoris en cliquant sur le bouton "
+"favori à côté d’un statut que vous aimez."
 
 #: actions/favorited.php:156
 #, php-format
@@ -1071,6 +1075,8 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
+"Pourquoi ne pas [créer un nouveau compte](%%action.register%%) et être le "
+"premier à ajouter un avis à vos favoris !"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
@@ -1107,13 +1113,12 @@ msgid "A selection of some of the great users on %s"
 msgstr "Les utilisateurs à ne pas manquer dans %s"
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice id"
-msgstr "Nouveau statut"
+msgstr "Pas d’identifiant de statut"
 
 #: actions/file.php:38
 msgid "No notice"
-msgstr "Aucun avis"
+msgstr "Aucun statut"
 
 #: actions/file.php:42
 msgid "No attachments"
@@ -1121,7 +1126,7 @@ msgstr "Aucune pièce jointe"
 
 #: actions/file.php:51
 msgid "No uploaded attachments"
-msgstr ""
+msgstr "Aucune pièce jointe importée"
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1129,11 +1134,11 @@ msgstr "Réponse inattendue !"
 
 #: actions/finishremotesubscribe.php:80
 msgid "User being listened to does not exist."
-msgstr "L'utilisateur suivi n'existe pas."
+msgstr "L’utilisateur suivi n’existe pas."
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
-msgstr "Vous pouvez utiliser l'abonnement local."
+msgstr "Vous pouvez utiliser l’abonnement local."
 
 #: actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
@@ -1145,7 +1150,7 @@ msgstr "Vous n'êtes pas autorisé."
 
 #: actions/finishremotesubscribe.php:109
 msgid "Could not convert request token to access token."
-msgstr "Impossible de convertir le jeton de requête en jeton d'accès."
+msgstr "Impossible de convertir le jeton de requête en jeton d’accès."
 
 #: actions/finishremotesubscribe.php:114
 msgid "Remote service uses unknown version of OMB protocol."
@@ -1172,7 +1177,7 @@ msgstr "Impossible de lire le fichier"
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 msgid "No group specified."
-msgstr "Aucun groupe n'a été spécifié."
+msgstr "Aucun groupe n’a été spécifié."
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
@@ -1184,7 +1189,7 @@ msgstr "Cet utilisateur est déjà bloqué pour le groupe."
 
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
-msgstr "L'utilisateur n'est pas membre du groupe."
+msgstr "L’utilisateur n’est pas membre du groupe."
 
 #: actions/groupblock.php:136 actions/groupmembers.php:314
 msgid "Block user from group"
@@ -1197,19 +1202,22 @@ msgid ""
 "be removed from the group, unable to post, and unable to subscribe to the "
 "group in the future."
 msgstr ""
+"Êtes-vous sûr(e) de vouloir bloquer l’utilisateur \"%s\" du groupe \"%s\"? "
+"Ils seront supprimés du groupe, il leur sera interdit d’y publier, et de s’y "
+"abonner à l’avenir."
 
 #: actions/groupblock.php:178
 msgid "Do not block this user from this group"
 msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
 #: actions/groupblock.php:179
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "Liste des utilisateurs inscrits à ce groupe."
+msgstr "Bloquer cet utilisateur de de groupe"
 
 #: actions/groupblock.php:196
 msgid "Database error blocking user from group."
 msgstr ""
+"Erreur de la base de données lors du blocage de l’utilisateur du groupe."
 
 #: actions/groupbyid.php:74
 msgid "No ID"
@@ -1220,9 +1228,8 @@ msgid "You must be logged in to edit a group."
 msgstr "Vous devez ouvrir une session pour modifier un groupe."
 
 #: actions/groupdesignsettings.php:141
-#, fuzzy
 msgid "Group design"
-msgstr "Groupes"
+msgstr "Conception du groupe"
 
 #: actions/groupdesignsettings.php:152
 msgid ""
@@ -1232,16 +1239,15 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
 #: lib/designsettings.php:434 lib/designsettings.php:464
-#, fuzzy
 msgid "Couldn't update your design."
-msgstr "Impossible de mettre à jour l'utilisateur."
+msgstr "Impossible de mettre à jour votre conception."
 
 #: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 #, fuzzy
 msgid "Unable to save your design settings!"
-msgstr "L'enregistrement de votre configuration Twitter a échoué !"
+msgstr "L’enregistrement de votre configuration Twitter a échoué !"
 
 #: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
 #, fuzzy
@@ -1261,9 +1267,8 @@ msgstr ""
 "est de %s."
 
 #: actions/grouplogo.php:362
-#, fuzzy
 msgid "Pick a square area of the image to be the logo."
-msgstr "Sélectionnez une zone de forme carrée pour définir votre avatar"
+msgstr "Sélectionnez une zone de forme carrée sur l’image qui sera le logo."
 
 #: actions/grouplogo.php:396
 msgid "Logo updated."
@@ -1375,11 +1380,11 @@ msgstr "Seul un administrateur peut débloquer les membres du groupes."
 
 #: actions/groupunblock.php:95
 msgid "User is not blocked from group."
-msgstr "Cet utilisateur n'est pas bloqué du groupe."
+msgstr "Cet utilisateur n’est pas bloqué du groupe."
 
 #: actions/groupunblock.php:128 actions/unblock.php:108
 msgid "Error removing the block."
-msgstr "Erreur lors de l'annulation du blocage."
+msgstr "Erreur lors de l’annulation du blocage."
 
 #: actions/imsettings.php:59
 msgid "IM Settings"
@@ -1397,7 +1402,7 @@ msgstr ""
 
 #: actions/imsettings.php:89
 msgid "IM is not available."
-msgstr "La messagerie instantanée n'est pas disponible."
+msgstr "La messagerie instantanée n’est pas disponible."
 
 #: actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
@@ -1409,7 +1414,7 @@ msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"En attente d'une confirmation pour cette adresse. Vérifiez votre compte "
+"En attente d’une confirmation pour cette adresse. Vérifiez votre compte "
 "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajouté %s à "
 "votre liste de contacts ?)"
 
@@ -1423,8 +1428,8 @@ msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
-"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d'ajouter %s "
-"à votre liste d'amis dans votre logiciel de messagerie instantanée ou dans "
+"Adresse Jabber ou GTalk (ex : nom@mondomaine.com). Assurez-vous d’ajouter %s "
+"à votre liste d’amis dans votre logiciel de messagerie instantanée ou dans "
 "GTalk."
 
 #: actions/imsettings.php:143
@@ -1452,7 +1457,7 @@ msgstr "Aucun identifiant Jabber"
 
 #: actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
-msgstr "Impossible d'utiliser cet identifiant Jabber"
+msgstr "Impossible d’utiliser cet identifiant Jabber"
 
 #: actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
@@ -1477,7 +1482,7 @@ msgstr ""
 
 #: actions/imsettings.php:387
 msgid "That is not your Jabber ID."
-msgstr "Ceci n'est pas votre identifiant Jabber."
+msgstr "Ceci n’est pas votre identifiant Jabber."
 
 #: actions/inbox.php:59
 #, php-format
@@ -1497,13 +1502,13 @@ msgstr ""
 
 #: actions/invite.php:39
 msgid "Invites have been disabled."
-msgstr ""
+msgstr "Les invitation ont été désactivées."
 
 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s"
 msgstr ""
-"Vous devez ouvrir une session pour inviter d'autres utilisateurs dans %s"
+"Vous devez ouvrir une session pour inviter d’autres utilisateurs dans %s"
 
 #: actions/invite.php:72
 #, php-format
@@ -1558,7 +1563,7 @@ msgstr "Adresses courriel"
 
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
-msgstr "Adresses d'amis à inviter (un par ligne)"
+msgstr "Adresses d’amis à inviter (un par ligne)"
 
 #: actions/invite.php:192
 msgid "Personal message"
@@ -1566,7 +1571,7 @@ msgstr "Message personnel"
 
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
-msgstr "Ajouter un message personnel à l'invitation (optionnel)."
+msgstr "Ajouter un message personnel à l’invitation (optionnel)."
 
 #: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
 msgid "Send"
@@ -1614,7 +1619,7 @@ msgstr ""
 "intéressent.\n"
 "\n"
 "Vous pouvez aussi partager des informations sur vous, vos idées, ou votre "
-"vie en ligne avec les personnes qui vous connaissent. C'est également un "
+"vie en ligne avec les personnes qui vous connaissent. C’est également un "
 "outil utile pour rencontrer de nouvelles personnes qui partagent vos "
 "intérêts.\n"
 "\n"
@@ -1627,7 +1632,7 @@ msgstr ""
 "%5$s\n"
 "\n"
 "Si vous souhaitez essayez ce service, cliquez sur le lien ci-dessous pour "
-"accepter l'invitation\n"
+"accepter l’invitation\n"
 "\n"
 "%6$s\n"
 "\n"
@@ -1642,12 +1647,12 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 
 #: actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
-msgstr "Vous êtes déjà membre de ce groupe "
+msgstr "Vous êtes déjà membre de ce groupe"
 
 #: actions/joingroup.php:128 lib/command.php:234
 #, php-format
 msgid "Could not join user %s to group %s"
-msgstr "Impossible d'inscrire l'utilisateur %s au groupe %s"
+msgstr "Impossible d’inscrire l’utilisateur %s au groupe %s"
 
 #: actions/joingroup.php:135 lib/command.php:239
 #, php-format
@@ -1664,12 +1669,12 @@ msgstr "Vous n'êtes pas membre de ce groupe."
 
 #: actions/leavegroup.php:119 lib/command.php:278
 msgid "Could not find membership record."
-msgstr "Aucun enregistrement à ce groupe n'a été trouvé."
+msgstr "Aucun enregistrement à ce groupe n’a été trouvé."
 
 #: actions/leavegroup.php:127 lib/command.php:284
 #, php-format
 msgid "Could not remove user %s to group %s"
-msgstr "Impossible de retirer l'utilisateur %s du groupe %s"
+msgstr "Impossible de retirer l’utilisateur %s du groupe %s"
 
 #: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
@@ -1681,9 +1686,8 @@ msgid "Already logged in."
 msgstr "Déjà connecté."
 
 #: actions/login.php:110 actions/login.php:120
-#, fuzzy
 msgid "Invalid or expired token."
-msgstr "Contenu invalide"
+msgstr "Jeton invalide ou expiré."
 
 #: actions/login.php:143
 msgid "Incorrect username or password."
@@ -1692,7 +1696,7 @@ msgstr "Identifiant ou mot de passe incorrect."
 #: actions/login.php:149 actions/recoverpassword.php:375
 #: actions/register.php:248
 msgid "Error setting user."
-msgstr "Erreur lors de la configuration de l'utilisateur."
+msgstr "Erreur lors de la configuration de l’utilisateur."
 
 #: actions/login.php:204 actions/login.php:257 lib/action.php:453
 #: lib/logingroupnav.php:79
@@ -1721,7 +1725,7 @@ msgstr "Se souvenir de moi"
 #: actions/login.php:253 actions/register.php:479
 msgid "Automatically login in the future; not for shared computers!"
 msgstr ""
-"Ouvrir automatiquement ma session à l'avenir (déconseillé pour les "
+"Ouvrir automatiquement ma session à l’avenir (déconseillé pour les "
 "ordinateurs publics ou partagés)"
 
 #: actions/login.php:263
@@ -1734,7 +1738,7 @@ msgid ""
 "changing your settings."
 msgstr ""
 "Pour des raisons de sécurité, veuillez entrer à nouveau votre identifiant et "
-"votre mot de passe afin d'enregistrer vos préférences."
+"votre mot de passe afin d’enregistrer vos préférences."
 
 #: actions/login.php:286
 #, fuzzy, php-format
@@ -1749,6 +1753,7 @@ msgstr ""
 #: actions/makeadmin.php:91
 msgid "Only an admin can make another user an admin."
 msgstr ""
+"Seul un administrateur peut faire d’un autre utilisateur un administrateur."
 
 #: actions/makeadmin.php:95
 #, php-format
@@ -1763,11 +1768,11 @@ msgstr ""
 #: actions/makeadmin.php:145
 #, php-format
 msgid "Can't make %s an admin for group %s"
-msgstr ""
+msgstr "Impossible de faire %s un administrateur du groupe %s"
 
 #: actions/microsummary.php:69
 msgid "No current status"
-msgstr "Aucun statut "
+msgstr "Aucun statut actuel"
 
 #: actions/newgroup.php:53
 msgid "New group"
@@ -1792,13 +1797,13 @@ msgstr "Aucun contenu !"
 
 #: actions/newmessage.php:158
 msgid "No recipient specified."
-msgstr "Aucun destinataire n'a été spécifié."
+msgstr "Aucun destinataire n’a été spécifié."
 
 #: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
-"N'envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
+"N’envoyez pas de message à vous-même ; dites-le plutôt dans votre tête..."
 
 #: actions/newmessage.php:181
 msgid "Message sent"
@@ -1835,9 +1840,9 @@ msgid "Text search"
 msgstr "Recherche de texte"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%s\" on %s"
-msgstr " Flux de recherche pour « %s »"
+msgstr "Résultat de la recherche pour « %s » sur %s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -1867,20 +1872,20 @@ msgstr "Statuts correspondant au(x) terme(s) \"%s\""
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set his email yet."
 msgstr ""
-"Cet utilisateur n'accepte pas les clins d'œil ou n'a pas encore validé son "
+"Cet utilisateur n’accepte pas les clins d’œil ou n’a pas encore validé son "
 "adresse courriel."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr "Clin d'œil envoyé"
+msgstr "Clin d’œil envoyé"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "Clin d'œil envoyé !"
+msgstr "Clin d’œil envoyé !"
 
 #: actions/oembed.php:79 actions/shownotice.php:100
 msgid "Notice has no profile"
-msgstr "Le statut n'a pas de profil"
+msgstr "Le statut n’a pas de profil"
 
 #: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
@@ -1918,7 +1923,7 @@ msgstr "Autres options à configurer"
 
 #: actions/othersettings.php:108
 msgid " (free service)"
-msgstr ""
+msgstr " (service gratuit)"
 
 #: actions/othersettings.php:116
 msgid "Shorten URLs with"
@@ -1926,7 +1931,7 @@ msgstr "Raccourcir les URL avec"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
-msgstr "Sélectionnez un service de réduction d'URL."
+msgstr "Sélectionnez un service de réduction d’URL."
 
 #: actions/othersettings.php:122
 #, fuzzy
@@ -1939,22 +1944,22 @@ msgstr ""
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Le service de réduction d'URL est trop long (50 caractères maximum)."
+msgstr "Le service de réduction d’URL est trop long (50 caractères maximum)."
 
 #: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %s - page %d"
-msgstr "Boîte d'envoi de %s - page %d"
+msgstr "Boîte d’envoi de %s - page %d"
 
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
-msgstr "Boîte d'envoi de %s"
+msgstr "Boîte d’envoi de %s"
 
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Cette boîte d'envoi regroupe les messages personnels que vous avez envoyés."
+"Cette boîte d’envoi regroupe les messages personnels que vous avez envoyés."
 
 #: actions/passwordsettings.php:58
 msgid "Change password"
@@ -2007,7 +2012,7 @@ msgstr "Ancien mot de passe incorrect"
 
 #: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
-msgstr "Erreur lors de l'enregistrement de l'utilisateur ; invalide."
+msgstr "Erreur lors de l’enregistrement de l’utilisateur ; invalide."
 
 #: actions/passwordsettings.php:186 actions/recoverpassword.php:368
 msgid "Can't save new password."
@@ -2058,7 +2063,7 @@ msgstr "Paramètres du profil"
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr ""
-"Vous pouvez mettre à jour les informations de votre profil pour qu'on en "
+"Vous pouvez mettre à jour les informations de votre profil pour qu’on en "
 "sache plus à votre sujet."
 
 #: actions/profilesettings.php:99
@@ -2106,7 +2111,7 @@ msgstr "Emplacement"
 
 #: actions/profilesettings.php:134 actions/register.php:472
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Indiquez votre emplacement, ex.: \"Ville, État (ou région), Pays\""
+msgstr "Indiquez votre emplacement, ex.: « Ville, État (ou région), Pays »"
 
 #: actions/profilesettings.php:138 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -2140,7 +2145,7 @@ msgstr "Quel est votre fuseau horaire habituel ?"
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
-"M'abonner automatiquement à tous ceux qui s'abonnent à moi (recommandé pour "
+"M’abonner automatiquement à tous ceux qui s’abonnent à moi (recommandé pour "
 "les utilisateurs non-humains)"
 
 #: actions/profilesettings.php:221 actions/register.php:223
@@ -2150,7 +2155,7 @@ msgstr "La bio est trop longue (%d caractères maximum)."
 
 #: actions/profilesettings.php:228
 msgid "Timezone not selected."
-msgstr "Aucun fuseau horaire n'a été choisi."
+msgstr "Aucun fuseau horaire n’a été choisi."
 
 #: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
@@ -2159,19 +2164,19 @@ msgstr "La langue est trop longue (255 caractères maximum)."
 #: actions/profilesettings.php:246 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Marquage invalide : \"%s\""
+msgstr "Marquage invalide : « %s »"
 
 #: actions/profilesettings.php:295
 msgid "Couldn't update user for autosubscribe."
-msgstr "Impossible de mettre à jour l'auto-abonnement."
+msgstr "Impossible de mettre à jour l’auto-abonnement."
 
 #: actions/profilesettings.php:328
 msgid "Couldn't save profile."
-msgstr "Impossible d'enregistrer le profil."
+msgstr "Impossible d’enregistrer le profil."
 
 #: actions/profilesettings.php:336
 msgid "Couldn't save tags."
-msgstr "Impossible d'enregistrer les marquages. "
+msgstr "Impossible d’enregistrer les marquages."
 
 #: actions/profilesettings.php:344
 msgid "Settings saved."
@@ -2196,19 +2201,16 @@ msgid "Public timeline"
 msgstr "Flux public"
 
 #: actions/public.php:151
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Fil du flux public"
+msgstr "Fil du flux public (RSS 1.0)"
 
 #: actions/public.php:155
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Fil du flux public"
+msgstr "Fil du flux public (RSS 2.0)"
 
 #: actions/public.php:159
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Fil du flux public"
+msgstr "Fil du flux public (Atom)"
 
 #: actions/public.php:179
 #, php-format
@@ -2219,7 +2221,7 @@ msgstr ""
 
 #: actions/public.php:182
 msgid "Be the first to post!"
-msgstr ""
+msgstr "Soyez le premier à poster !"
 
 #: actions/public.php:186
 #, php-format
@@ -2252,9 +2254,8 @@ msgstr ""
 "wiki/Microblog) "
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Marquages publics"
+msgstr "Nuage de mots clefs public"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -2268,7 +2269,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:72
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "Soyez le premier à en poster une !"
 
 #: actions/publictagcloud.php:75
 #, php-format
@@ -2278,9 +2279,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:135
-#, fuzzy
 msgid "Tag cloud"
-msgstr "Marquages "
+msgstr "Nuage de mots clefs"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
@@ -2288,15 +2288,15 @@ msgstr "Votre session est déjà ouverte !"
 
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
-msgstr "Code de récupération non trouvé. "
+msgstr "Code de récupération non trouvé."
 
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
-msgstr "Ceci n'est pas un code de récupération."
+msgstr "Ceci n’est pas un code de récupération."
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr "Code de récupération d'un utilisateur inconnu."
+msgstr "Code de récupération d’un utilisateur inconnu."
 
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
@@ -2304,12 +2304,12 @@ msgstr "Erreur dans le code de confirmation."
 
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
-msgstr "Ce code de validation est périmé. Veuillez recommencer. "
+msgstr "Ce code de validation est périmé. Veuillez recommencer."
 
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
 msgstr ""
-"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
+"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
 
 #: actions/recoverpassword.php:152
 msgid ""
@@ -2319,20 +2319,20 @@ msgstr ""
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "Vous avez été identifié. Entrez un nouveau mot de passe ci-dessous. "
 
 #: actions/recoverpassword.php:188
 msgid "Password recovery"
-msgstr ""
+msgstr "Récupération de mot de passe"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
-msgstr ""
+msgstr "Pseudo ou adresse de courriel"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
-"Votre pseudo sur ce serveur, ou l'adresse courriel que vous avez enregistrée."
+"Votre pseudo sur ce serveur, ou l’adresse courriel que vous avez enregistrée."
 
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
@@ -2356,7 +2356,7 @@ msgstr "Action inconnue"
 
 #: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 caractères ou plus, et ne l'oubliez pas !"
+msgstr "6 caractères ou plus, et ne l’oubliez pas !"
 
 #: actions/recoverpassword.php:240
 msgid "Same as password above"
@@ -2380,7 +2380,7 @@ msgstr "Aucune adresse courriel enregistrée pour cet utilisateur."
 
 #: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
-msgstr "Erreur lors de l'enregistrement de la confirmation du courriel."
+msgstr "Erreur lors de l’enregistrement de la confirmation du courriel."
 
 #: actions/recoverpassword.php:325
 msgid ""
@@ -2388,7 +2388,7 @@ msgid ""
 "address registered to your account."
 msgstr ""
 "Les instructions pour récupérer votre mot de passe ont été envoyées à "
-"l'adresse courriel indiquée dans votre compte."
+"l’adresse courriel indiquée dans votre compte."
 
 #: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
@@ -2409,11 +2409,11 @@ msgstr ""
 
 #: actions/register.php:85 actions/register.php:189 actions/register.php:404
 msgid "Sorry, only invited people can register."
-msgstr "Désolé ! Seules les personnes invitées peuvent s'inscrire."
+msgstr "Désolé ! Seules les personnes invitées peuvent s’inscrire."
 
 #: actions/register.php:92
 msgid "Sorry, invalid invitation code."
-msgstr "Désolé, code d'invitation invalide."
+msgstr "Désolé, code d’invitation invalide."
 
 #: actions/register.php:112
 msgid "Registration successful"
@@ -2487,13 +2487,12 @@ msgid "Creative Commons Attribution 3.0"
 msgstr "Creative Commons Paternité 3.0"
 
 #: actions/register.php:496
-#, fuzzy
 msgid ""
 " except this private data: password, email address, IM address, and phone "
 "number."
 msgstr ""
-"à l'exception de ces données personnelles : mot de passe, adresse e-mail, "
-"adresse de messagerie instantanée, numéro de téléphone. "
+" à l’exception de ces données personnelles : mot de passe, adresse e-mail, "
+"adresse de messagerie instantanée, numéro de téléphone."
 
 #: actions/register.php:537
 #, php-format
@@ -2518,7 +2517,7 @@ msgstr ""
 "\n"
 "* Visiter [votre profil](%s) et publier votre premier statut.\n"
 "* Ajouter une adresse [Jabber/GTalk](%%%%action.imsettings%%%%) afin "
-"d'envoyer et recevoir vos statuts par messagerie instantanée.\n"
+"d’envoyer et recevoir vos statuts par messagerie instantanée.\n"
 "* [Chercher des personnes](%%%%action.peoplesearch%%%%) que vous pourriez "
 "connaître ou qui partagent vos intêrets.\n"
 "* Mettre votre [profil](%%%%action.profilesettings%%%%) à jour pour en dire "
@@ -2526,7 +2525,7 @@ msgstr ""
 "* Parcourir la [documentation](%%%%doc.help%%%%) en ligne pour en savoir "
 "plus sur le fonctionnement du service.\n"
 "\n"
-"Merci pour votre inscription ! Nous vous souhaitons d'apprécier notre "
+"Merci pour votre inscription ! Nous vous souhaitons d’apprécier notre "
 "service."
 
 #: actions/register.php:561
@@ -2546,24 +2545,24 @@ msgid ""
 msgstr ""
 "Pour vous abonner, vous devez [ouvrir une session](%%action.login%%), ou "
 "[créer un nouveau compte](%%action.register%%). Si vous avez déjà un compte "
-"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l'URL "
+"sur un [site de micro-blogging compatible](%%doc.openmublog%%), entrez l’URL "
 "de votre profil ci-dessous."
 
 #: actions/remotesubscribe.php:112
 msgid "Remote subscribe"
-msgstr "Abonnement à distance "
+msgstr "Abonnement à distance"
 
 #: actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
-msgstr "S'abonner à un utilisateur distant"
+msgstr "S’abonner à un utilisateur distant"
 
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
-msgstr "Pseudo de l'utilisateur"
+msgstr "Pseudo de l’utilisateur"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr "Pseudo de l'utilisateur que vous voulez suivre"
+msgstr "Pseudo de l’utilisateur que vous voulez suivre"
 
 #: actions/remotesubscribe.php:133
 msgid "Profile URL"
@@ -2576,17 +2575,17 @@ msgstr "URL de votre profil sur un autre service de micro-blogging compatible"
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:321
 msgid "Subscribe"
-msgstr "S'abonner"
+msgstr "S’abonner"
 
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "URL du profil invalide (mauvais format)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid ""
 "Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
-msgstr "URL de profil invalide (aucun document YADIS)."
+msgstr ""
+"URL de profil invalide (aucun document YADIS ou définition XRDS invalide)."
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
@@ -2594,7 +2593,7 @@ msgstr "Ce profil est local ! Connectez-vous pour vous abonner."
 
 #: actions/remotesubscribe.php:183
 msgid "Couldn’t get a request token."
-msgstr "Impossible d'obtenir un jeton de requête."
+msgstr "Impossible d’obtenir un jeton de requête."
 
 #: actions/replies.php:125 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -2608,19 +2607,19 @@ msgid "Replies to %s, page %d"
 msgstr "Réponses à %s - page %d"
 
 #: actions/replies.php:144
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des réponses pour %s (RSS 1.0)"
 
 #: actions/replies.php:151
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des réponses pour %s (RSS 2.0)"
 
 #: actions/replies.php:158
 #, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des réponses pour %s (Atom)"
 
 #: actions/replies.php:198
 #, php-format
@@ -2642,6 +2641,8 @@ msgid ""
 "You can try to [nudge %s](../%s) or [post something to his or her attention]"
 "(%%%%action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
+"Vous pouvez essayer de [faire un clin d’œil à %s](../%s) ou de [publier "
+"quelque chose à son attention](%%%%action.newnotice%%%%?status_textarea=%s)"
 
 #: actions/repliesrss.php:72
 #, fuzzy, php-format
@@ -2655,7 +2656,7 @@ msgstr "Avis favoris de %s, page %d"
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
-msgstr "Impossible d'afficher les favoris."
+msgstr "Impossible d’afficher les favoris."
 
 #: actions/showfavorites.php:170
 #, php-format
@@ -2677,6 +2678,9 @@ msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"Vous n’avez pas choisi d’avis favori pour le moment. Cliquez sur le bouton "
+"favori sur les avis que vous aimez pour les mémoriser à l’avenir ou les "
+"mettre en lumière."
 
 #: actions/showfavorites.php:207
 #, php-format
@@ -2684,6 +2688,8 @@ msgid ""
 "%s hasn't added any notices to his favorites yet. Post something interesting "
 "they would add to their favorites :)"
 msgstr ""
+"%s n’a pas ajouté d’avis à ses favoris pour le moment. Publiez quelque chose "
+"d’intéressant, et cela pourrait être ajouté à ses favoris :)"
 
 #: actions/showfavorites.php:211
 #, php-format
@@ -2692,10 +2698,13 @@ msgid ""
 "account](%%%%action.register%%%%) and then post something interesting they "
 "would add to their favorites :)"
 msgstr ""
+"%s n’a pas ajouté d’avis à ses favoris pour le moment. Vous pourriez [créer "
+"un compte](%%%%action.register%%%%), puis publier quelque chose "
+"d’intéressant, qui serait ajouté à ses favoris :)"
 
 #: actions/showfavorites.php:242
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "C’est un moyen de partager ce que vous aimez."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
@@ -2747,7 +2756,7 @@ msgstr "Fil des avis du groupe %s (Atom)"
 #: actions/showgroup.php:345
 #, php-format
 msgid "FOAF for %s group"
-msgstr "Boîte d'envoi de %s"
+msgstr "ami d’un ami pour le groupe %s"
 
 #: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 msgid "Members"
@@ -2789,7 +2798,7 @@ msgid ""
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** est un groupe d'utilisateurs du service de [micro-blogging](http://fr."
+"**%s** est un groupe d’utilisateurs du service de [micro-blogging](http://fr."
 "wikipedia.org/wiki/Microblog)  %%%%site.name%%%%"
 
 #: actions/showgroup.php:482
@@ -2821,9 +2830,9 @@ msgid "Notice deleted."
 msgstr "Avis supprimé."
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid " tagged %s"
-msgstr "Statuts marqués avec %s"
+msgstr "   marqué %s"
 
 #: actions/showstream.php:79
 #, php-format
@@ -2831,40 +2840,42 @@ msgid "%s, page %d"
 msgstr "%s - page %d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s tagged %s (RSS 1.0)"
-msgstr "Fil des statuts du groupe %s"
+msgstr "Fil des statuts pour %s marqués %s (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts de %s (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts de %s (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts de %s (Atom)"
 
 #: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s"
-msgstr "Boîte d'envoi de %s"
+msgstr "ami d’un ami pour %s"
 
 #: actions/showstream.php:191
 #, php-format
 msgid "This is the timeline for %s but %s hasn't posted anything yet."
-msgstr ""
+msgstr "C’est le flux de %s mais %s n’a rien publié pour le moment."
 
 #: actions/showstream.php:196
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
+"Avez-vous vu quelque chose d’intéressant récemment ? Vous n’avez pas publié "
+"d’avis pour le moment, vous pourriez commencer maintenant :)"
 
 #: actions/showstream.php:198
 #, php-format
@@ -2872,6 +2883,8 @@ msgid ""
 "You can try to nudge %s or [post something to his or her attention](%%%%"
 "action.newnotice%%%%?status_textarea=%s)."
 msgstr ""
+"Vous pouvez essayer de faire un clin d’œil à %s ou de [publier quelque chose "
+"à son attention](%%%%action.newnotice%%%%?status_textarea=%s)."
 
 #: actions/showstream.php:234
 #, php-format
@@ -2957,13 +2970,13 @@ msgid "That phone number already belongs to another user."
 msgstr "Ce numéro de téléphone est déjà utilisé."
 
 #: actions/smssettings.php:347
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 "Un code de confirmation a été envoyé au numéro de téléphone indiqué. "
-"Vérifiez votre boîte de réception pour récupérer le code et les instructions."
+"Vérifiez votre boîte de réception pour récupérer le code et les instructions "
+"pour son utilisation."
 
 #: actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
@@ -2971,7 +2984,7 @@ msgstr "Ce code de confirmation est incorrect."
 
 #: actions/smssettings.php:405
 msgid "That is not your phone number."
-msgstr "Ceci n'est pas votre numéro de téléphone."
+msgstr "Ceci n’est pas votre numéro de téléphone."
 
 #: actions/smssettings.php:465
 msgid "Mobile carrier"
@@ -2988,7 +3001,7 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 "Votre fournisseur de téléphonie mobile. Si vous connaissez un fournisseur "
-"qui accepte la réception de SMS par courriel mais qui n'est pas listé ici, "
+"qui accepte la réception de SMS par courriel mais qui n’est pas listé ici, "
 "écrivez-nous à %s."
 
 #: actions/smssettings.php:498
@@ -3001,11 +3014,11 @@ msgstr "Vous n'êtes pas abonné(e) à ce profil."
 
 #: actions/subedit.php:83
 msgid "Could not save subscription."
-msgstr "Impossible d'enregistrer l'abonnement."
+msgstr "Impossible d’enregistrer l’abonnement."
 
 #: actions/subscribe.php:55
 msgid "Not a local user."
-msgstr "Ceci n'est pas un utilisateur local."
+msgstr "Ceci n’est pas un utilisateur local."
 
 #: actions/subscribe.php:69
 msgid "Subscribed"
@@ -3023,7 +3036,7 @@ msgstr "Abonnés à %s - page &d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
-msgstr "Ces personnes suivent vos statuts. "
+msgstr "Ces personnes suivent vos statuts."
 
 #: actions/subscribers.php:67
 #, php-format
@@ -3035,11 +3048,13 @@ msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
 msgstr ""
+"Vous n’avez pas d’abonnés. Essayez de vous abonner à des gens que vous "
+"connaissez et ils pourraient vous retourner la faveur."
 
 #: actions/subscribers.php:110
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "%s n’a pas d’abonnés. Voulez-vous être le premier ?"
 
 #: actions/subscribers.php:114
 #, php-format
@@ -3047,6 +3062,8 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"%s n’a pas d’abonnés. Vous pourriez [créer un compte](%%%%action.register%%%"
+"%) et être le premier ?"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -3076,6 +3093,12 @@ msgid ""
 "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
 "automatically subscribe to people you already follow there."
 msgstr ""
+"Vous ne suivez les avis de personne pour le moment, essayez de vous abonnez "
+"à des gens que vous connaissez. Essayez la [recherche de personnes](%%action."
+"peoplesearch%%), cherchez les membres de groupes auquels vous vous "
+"intéressez et nos [utilisateurs en vedette](%%action.featured%%). Si vous "
+"êtes un [utilisateur de Twitter](%%action.twittersettings%%), vous pouvez "
+"vous abonner automatiquement aux gens auquels vous êtes déjà abonné là-bas."
 
 #: actions/subscriptions.php:123 actions/subscriptions.php:127
 #, php-format
@@ -3096,7 +3119,7 @@ msgstr "Aucune session ouverte"
 
 #: actions/tagother.php:39
 msgid "No id argument."
-msgstr "Aucun argument d'identification."
+msgstr "Aucun argument d’identification."
 
 #: actions/tagother.php:65
 #, php-format
@@ -3105,7 +3128,7 @@ msgstr "Marquage %s"
 
 #: actions/tagother.php:77 lib/userprofile.php:75
 msgid "User profile"
-msgstr "Profil de l'utilisateur"
+msgstr "Profil de l’utilisateur"
 
 #: actions/tagother.php:81 lib/userprofile.php:102
 msgid "Photo"
@@ -3113,7 +3136,7 @@ msgstr "Photo"
 
 #: actions/tagother.php:141
 msgid "Tag user"
-msgstr "Marquer l'utilisateur"
+msgstr "Marquer l’utilisateur"
 
 #: actions/tagother.php:151
 msgid ""
@@ -3130,7 +3153,7 @@ msgstr ""
 
 #: actions/tagother.php:200
 msgid "Could not save tags."
-msgstr "Impossible d'enregistrer les marquages."
+msgstr "Impossible d’enregistrer les marquages."
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -3143,19 +3166,19 @@ msgid "Notices tagged with %s, page %d"
 msgstr "Statuts marqués %s - page %d"
 
 #: actions/tag.php:86
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts pour le marquage %s (RSS 1.0)"
 
 #: actions/tag.php:92
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts pour le marquage %s (RSS 2.0)"
 
 #: actions/tag.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "Flux des statuts de %s"
+msgstr "Flux des statuts pour le marquage %s (Atom)"
 
 #: actions/tagrss.php:35
 msgid "No such tag."
@@ -3181,21 +3204,22 @@ msgstr "Désabonné"
 #, php-format
 msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
 msgstr ""
+"La licence du flux auquel vous avez souscrit ‘%s’ n’est pas compatible avec "
+"la licence du site ‘%s’."
 
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
-msgstr "Autoriser l'abonnement"
+msgstr "Autoriser l’abonnement"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""
 "Veuillez vérifier ces détails pour vous assurer que vous souhaitez vous "
-"abonner aux statuts de cet utilisateur. Si vous n'avez pas demandé à vous "
-"abonner aux statuts de quelqu'un, cliquez \"Annuler\"."
+"abonner aux statuts de cet utilisateur. Si vous n’avez pas demandé à vous "
+"abonner aux statuts de quelqu’un, cliquez « Rejeter »."
 
 #: actions/userauthorization.php:188
 msgid "License"
@@ -3208,7 +3232,7 @@ msgstr "Accepter"
 #: actions/userauthorization.php:210 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
 msgid "Subscribe to this user"
-msgstr "S'abonner à cet utilisateur"
+msgstr "S’abonner à cet utilisateur"
 
 #: actions/userauthorization.php:211
 msgid "Reject"
@@ -3220,7 +3244,7 @@ msgstr "Rejeter cette souscription"
 
 #: actions/userauthorization.php:225
 msgid "No authorization request!"
-msgstr "Pas de requête d'autorisation !"
+msgstr "Pas de requête d’autorisation !"
 
 #: actions/userauthorization.php:247
 msgid "Subscription authorized"
@@ -3233,59 +3257,58 @@ msgid ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"L'abonnement a été autorisé, mais l'URL de rappel n'a pas été validé. "
+"L’abonnement a été autorisé, mais l’URL de rappel n’a pas été validé. "
 "Vérifiez les instructions du site pour savoir comment compléter "
-"l'autorisation de l'abonnement. Votre jeton d'abonnement est :"
+"l’autorisation de l’abonnement. Votre jeton d’abonnement est :"
 
 #: actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "Abonnement refusé"
 
 #: actions/userauthorization.php:261
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"L'abonnement a été refusé, mais l'URL de rappel n'a pas été validé. Vérifiez "
-"les instructions du site pour savoir comment refuser pleinement "
-"l'abonnement. "
+"L’abonnement a été refusé, mais aucune URL de rappel n’a pas été passée. "
+"Vérifiez les instructions du site pour savoir comment refuser pleinement "
+"l’abonnement."
 
 #: actions/userauthorization.php:296
 #, php-format
 msgid "Listener URI ‘%s’ not found here"
-msgstr ""
+msgstr "L’URI de l’auditeur ‘%s’ n’a pas été trouvée"
 
 #: actions/userauthorization.php:301
 #, php-format
 msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est trop longue."
 
 #: actions/userauthorization.php:307
 #, php-format
 msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "L’URI à laquelle vous avez souscrit ‘%s’ est un utilisateur local."
 
 #: actions/userauthorization.php:322
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "L’URL du profil ‘%s’ est pour un utilisateur local."
 
 #: actions/userauthorization.php:338
 #, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "L’URL de l’avatar ‘%s’ n’est pas valide."
 
 #: actions/userauthorization.php:343
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Impossible de lire l'URL de l'avatar « %s »."
+msgstr "Impossible de lire l’URL de l’avatar « %s »."
 
 #: actions/userauthorization.php:348
 #, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Format d'image invalide pour l'URL de l'avatar « %s »."
+msgstr "Format d’image invalide pour l’URL de l’avatar « %s »."
 
 #: actions/userbyid.php:70
 msgid "No id."
@@ -3293,17 +3316,19 @@ msgstr "Aucun identifiant."
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"
-msgstr "Conception de profile"
+msgstr "Conception de profil"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
+"Personnalisez l’apparence de votre profil avec une image d’arrière plan et "
+"une palette de couleurs de votre choix."
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Bon appétit !"
 
 #: actions/usergroups.php:64
 #, php-format
@@ -3317,12 +3342,14 @@ msgstr "Rechercher pour plus de groupes"
 #: actions/usergroups.php:153
 #, php-format
 msgid "%s is not a member of any group."
-msgstr "%s n'est pas membre d'aucun groupe."
+msgstr "%s n’est pas membre d’un groupe."
 
 #: actions/usergroups.php:158
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
+"Essayez de [rechercher un groupe](%%action.groupsearch%%) et de vous y "
+"inscrire."
 
 #: classes/File.php:137
 #, php-format
@@ -3330,20 +3357,22 @@ msgid ""
 "No file may be larger than %d bytes and the file you sent was %d bytes. Try "
 "to upload a smaller version."
 msgstr ""
+"Un fichier ne peut pas être plus gros que %d octets et le fichier que vous "
+"avez envoyé pesait %d octets. Essayez d’importer une version moins grosse."
 
 #: classes/File.php:147
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "Un fichier aussi gros dépasserai votre quota utilisateur de %d octets."
 
 #: classes/File.php:154
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "Un fichier aussi gros dépasserai votre quota mensuel de %d octets."
 
 #: classes/Message.php:55
 msgid "Could not insert message."
-msgstr "Impossible d'insérer le message."
+msgstr "Impossible d’insérer le message."
 
 #: classes/Message.php:65
 msgid "Could not update message with new URI."
@@ -3356,11 +3385,11 @@ msgstr "Erreur de base de donnée en insérant le hashtag : %s"
 
 #: classes/Notice.php:179
 msgid "Problem saving notice. Too long."
-msgstr "Problème lors de l'enregistrement de l'avis ; trop long."
+msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
 
 #: classes/Notice.php:183
 msgid "Problem saving notice. Unknown user."
-msgstr "Erreur lors de l'enregistrement du statut. Utilisateur inconnu."
+msgstr "Erreur lors de l’enregistrement du statut. Utilisateur inconnu."
 
 #: classes/Notice.php:188
 msgid ""
@@ -3384,7 +3413,7 @@ msgstr "Il vous est interdit de publier des statuts dans ce site."
 
 #: classes/Notice.php:268 classes/Notice.php:293
 msgid "Problem saving notice."
-msgstr "Problème lors de l'enregistrement du statut."
+msgstr "Problème lors de l’enregistrement du statut."
 
 #: classes/Notice.php:1120
 #, php-format
@@ -3392,9 +3421,9 @@ msgid "DB error inserting reply: %s"
 msgstr "Erreur de base de donnée en insérant la réponse :%s"
 
 #: classes/User.php:347
-#, fuzzy, php-format
+#, php-format
 msgid "Welcome to %1$s, @%2$s!"
-msgstr "Message adressé à %1$s le %2$s"
+msgstr "Bienvenu à %1$s, %2$s !"
 
 #: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
 msgid "Profile"
@@ -3422,7 +3451,7 @@ msgstr "Conception"
 
 #: lib/accountsettingsaction.php:124
 msgid "Design your profile"
-msgstr "Concevez votre profile"
+msgstr "Concevez votre profil"
 
 #: lib/accountsettingsaction.php:128
 msgid "Other"
@@ -3458,9 +3487,8 @@ msgid "Account"
 msgstr "Compte"
 
 #: lib/action.php:432
-#, fuzzy
 msgid "Change your email, avatar, password, profile"
-msgstr "Modifier votre courriel, avatar, mot de passe, profil "
+msgstr "Modifier votre courriel, avatar, mot de passe, profil"
 
 #: lib/action.php:435
 msgid "Connect"
@@ -3501,7 +3529,7 @@ msgstr "Aide"
 
 #: lib/action.php:456
 msgid "Help me!"
-msgstr "À l'aide !"
+msgstr "À l’aide !"
 
 #: lib/action.php:459
 msgid "Search"
@@ -3537,7 +3565,7 @@ msgstr "FAQ"
 
 #: lib/action.php:727
 msgid "TOS"
-msgstr ""
+msgstr "CGU"
 
 #: lib/action.php:730
 msgid "Privacy"
@@ -3554,7 +3582,7 @@ msgstr "Contact"
 #: lib/action.php:736
 #, fuzzy
 msgid "Badge"
-msgstr "Clin d'œil"
+msgstr "Clin d’œil"
 
 #: lib/action.php:764
 msgid "StatusNet software license"
@@ -3591,25 +3619,25 @@ msgstr "Licence du contenu du site"
 
 #: lib/action.php:794
 msgid "All "
-msgstr "Tous"
+msgstr "Tous "
 
 #: lib/action.php:799
 msgid "license."
 msgstr "licence."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Pagination"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Après"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Avant"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Un problème est survenu avec votre jeton de session."
 
@@ -3627,11 +3655,11 @@ msgstr "Fournisseur"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Statuts sur lesquels cette pièce jointe apparait."
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "Marques de cette pièce jointe"
 
 #: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
@@ -3647,22 +3675,22 @@ msgstr "Échec de la commande"
 
 #: lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
-msgstr "Désolé, cette commande n'a pas encore été implémantée."
+msgstr "Désolé, cette commande n’a pas encore été implémentée."
 
 #: lib/command.php:88
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
-"Impossible de mettre l'utilisateur à jour avec l'adresse courriel confirmée."
+"Impossible de mettre l’utilisateur à jour avec l’adresse courriel confirmée."
 
 #: lib/command.php:92
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
 
 #: lib/command.php:99
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
-msgstr "Clin d'œil envoyé"
+msgstr "Clin d’œil envoyé"
 
 #: lib/command.php:126
 #, php-format
@@ -3677,7 +3705,7 @@ msgstr ""
 
 #: lib/command.php:152 lib/command.php:400
 msgid "Notice with that id does not exist"
-msgstr ""
+msgstr "Aucun statut avec cet identifiant n’existe"
 
 #: lib/command.php:168 lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
@@ -3721,7 +3749,7 @@ msgstr ""
 
 #: lib/command.php:377
 msgid "Error sending direct message."
-msgstr "Une erreur est survenue pendant l'envoi de votre message."
+msgstr "Une erreur est survenue pendant l’envoi de votre message."
 
 #: lib/command.php:431
 #, php-format
@@ -3737,11 +3765,11 @@ msgstr "Réponse à %s envoyée"
 
 #: lib/command.php:441
 msgid "Error saving notice."
-msgstr "Problème lors de l'enregistrement de l'avis."
+msgstr "Problème lors de l’enregistrement de l’avis."
 
 #: lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
-msgstr "Indiquez le nom de l'utilisateur auquel vous souhaitez vous abonner "
+msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
 
 #: lib/command.php:502
 #, php-format
@@ -3750,7 +3778,7 @@ msgstr "Abonné à %s"
 
 #: lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
-msgstr "Indiquez le nom de l'utilisateur duquel vous souhaitez vous désabonner"
+msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
 
 #: lib/command.php:530
 #, php-format
@@ -3759,7 +3787,7 @@ msgstr "Désabonné de %s"
 
 #: lib/command.php:548 lib/command.php:571
 msgid "Command not yet implemented."
-msgstr "Cette commande n'a pas encore été implémantée."
+msgstr "Cette commande n’a pas encore été implémentée."
 
 #: lib/command.php:551
 msgid "Notification off."
@@ -3775,25 +3803,61 @@ msgstr "Avertissements activés."
 
 #: lib/command.php:576
 msgid "Can't turn on notification."
-msgstr "Impossible d'activer les avertissements."
+msgstr "Impossible d’activer les avertissements."
 
 #: lib/command.php:597
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Impossible de créer le formulaire OpenID : %s"
+msgstr "Impossible de créer le jeton de connexion pour %s"
 
 #: lib/command.php:602
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
+"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
+"pendant 2 minutes : %s"
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Vous n'êtes pas abonné(e) à ce profil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Vous n'êtes pas abonné(e) à ce profil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Impossible d’abonner une autre personne à votre profil."
 
-#: lib/command.php:613
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Abonnés de %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Vous n'êtes pas membre de ce groupe."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Vous n'êtes pas membre de ce groupe."
+
+#: lib/command.php:670
+#, fuzzy
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3822,22 +3886,55 @@ msgid ""
 "tracks - not yet implemented.\n"
 "tracking - not yet implemented.\n"
 msgstr ""
+"Commandes :\n"
+"on - activer les notifications\n"
+"off - désactiver les notifications\n"
+"help - montrer l’aide\n"
+"follow <nickname> - s’abonner à l’utilisateur\n"
+"leave <nickname> - se désabonner de l’utilisateur\n"
+"d <nickname> <text> - message direct à l’utilisateur\n"
+"get <nickname> - obtenir le dernier avis de l’utilisateur\n"
+"whois <nickname> - obtenir le profil de cet utilisateur\n"
+"fav <nickname> - ajouter de dernier avis de l’utilisateur comme favori\n"
+"fav #<notice_id> - ajouter l’avis correspondant à l’id comme favori\n"
+"reply #<notice_id> - répondre à l’avis correspondant à l’id\n"
+"reply <nickname> - répondre au dernier avis de l’utilisateur\n"
+"join <group> - s’inscrire au groupe\n"
+"login - Obtenir un lien pour s’identifier sur l’interface web\n"
+"drop <group> - quitter le groupe\n"
+"stats - obtenir vos statistiques\n"
+"stop - même effet que 'off'\n"
+"quit - même effet que 'off'\n"
+"sub <nickname> - même effet que 'follow'\n"
+"unsub <nickname> - même effet que 'leave'\n"
+"last <nickname> - même effet que 'get'\n"
+"on <nickname> - pas encore implémenté.\n"
+"off <nickname> - pas encore implémenté.\n"
+"nudge <nickname> - rappeler à un utilisateur de publier.\n"
+"invite <phone number> - pas encore implémenté.\n"
+"track <word> - pas encore implémenté.\n"
+"untrack <word> - pas encore implémenté.\n"
+"track off - pas encore implémenté.\n"
+"untrack all - pas encore implémenté.\n"
+"tracks - pas encore implémenté.\n"
+"tracking - pas encore implémenté.\n"
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr "Aucun fichier de configuration n'a été trouvé. "
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
+"J’ai cherché des fichiers de configuration dans les emplacements suivants : "
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "Vous pouvez essayer de lancer l’installeur pour régler ce problème."
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
-msgstr "Aller au programme d'installation"
+msgstr "Aller au programme d’installation"
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
@@ -3857,33 +3954,34 @@ msgstr "Erreur de la base de données"
 
 #: lib/designsettings.php:101
 msgid "Change background image"
-msgstr ""
+msgstr "Changer l’image d’arrière plan"
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "Transfert"
+msgstr "Importer un fichier"
 
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
+"Vous pouvez importer une image d’arrière plan personnelle. La taille "
+"maximale du fichier est de 2 Mo."
 
 #: lib/designsettings.php:139
 msgid "On"
-msgstr ""
+msgstr "Activé"
 
 #: lib/designsettings.php:155
 msgid "Off"
-msgstr ""
+msgstr "Désactivé"
 
 #: lib/designsettings.php:156
 msgid "Turn background image on or off."
-msgstr ""
+msgstr "Activer ou désactiver l’image d’arrière plan."
 
 #: lib/designsettings.php:161
 msgid "Tile background image"
-msgstr ""
+msgstr "Répéter l’image d’arrière plan"
 
 #: lib/designsettings.php:170
 msgid "Change colours"
@@ -3891,7 +3989,7 @@ msgstr "Modifier les couleurs"
 
 #: lib/designsettings.php:178
 msgid "Background"
-msgstr ""
+msgstr "Arrière plan"
 
 #: lib/designsettings.php:191
 msgid "Content"
@@ -3911,19 +4009,19 @@ msgstr "Liens"
 
 #: lib/designsettings.php:247
 msgid "Use defaults"
-msgstr ""
+msgstr "Utiliser les valeurs par défaut"
 
 #: lib/designsettings.php:248
 msgid "Restore default designs"
-msgstr ""
+msgstr "Restaurer les conceptions par défaut"
 
 #: lib/designsettings.php:254
 msgid "Reset back to default"
-msgstr ""
+msgstr "Revenir aux valeurs par défaut"
 
 #: lib/designsettings.php:257
 msgid "Save design"
-msgstr ""
+msgstr "Sauvegarder la conception"
 
 #: lib/designsettings.php:372
 msgid "Bad default color settings: "
@@ -3931,7 +4029,7 @@ msgstr ""
 
 #: lib/designsettings.php:468
 msgid "Design defaults restored."
-msgstr ""
+msgstr "Les paramètre par défaut de la conception ont été restaurés."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -3963,7 +4061,7 @@ msgstr "Atom"
 
 #: lib/feed.php:91
 msgid "FOAF"
-msgstr ""
+msgstr "Ami d’un ami"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
@@ -3974,9 +4072,8 @@ msgid "All"
 msgstr "Tous"
 
 #: lib/galleryaction.php:139
-#, fuzzy
 msgid "Select tag to filter"
-msgstr "Sélectionnez un fournisseur de téléphone mobile"
+msgstr "Sélectionner une marque à filtrer"
 
 #: lib/galleryaction.php:140
 msgid "Tag"
@@ -3995,14 +4092,13 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL du site Web ou blogue du groupe ou sujet "
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Description du groupe ou du sujet (140 caractères maximum)"
+msgstr "Description du groupe ou du sujet"
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Description du groupe ou du sujet (140 caractères maximum)"
+msgstr "Description du groupe ou du sujet en %d caractères"
 
 #: lib/groupeditform.php:172
 msgid "Description"
@@ -4011,12 +4107,16 @@ msgstr "Description"
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Emplacement du groupe, s'il y a lieu \"Ville, État ou région, Pays\""
+msgstr ""
+"Emplacement du groupe, s’il y a lieu, de la forme « Ville, État ou région, "
+"Pays »"
 
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
+"Pseudos supplémentaires pour le groupe, séparés par des virgules ou des "
+"espaces, %d au maximum"
 
 #: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
@@ -4066,7 +4166,7 @@ msgstr "Marquages des statuts du groupe %s"
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
-"Cette page n'est pas disponible dans un des formats que vous avez autorisés."
+"Cette page n’est pas disponible dans un des formats que vous avez autorisés."
 
 #: lib/imagefile.php:75
 #, fuzzy, php-format
@@ -4083,11 +4183,11 @@ msgstr "Erreur système lors du transfert du fichier."
 
 #: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
-msgstr "Ceci n'est pas une image, ou c'est un fichier corrompu."
+msgstr "Ceci n’est pas une image, ou c’est un fichier corrompu."
 
 #: lib/imagefile.php:105
 msgid "Unsupported image file format."
-msgstr "Format de fichier d'image non supporté."
+msgstr "Format de fichier d’image non supporté."
 
 #: lib/imagefile.php:118
 msgid "Lost our file."
@@ -4100,7 +4200,7 @@ msgstr "Type de fichier inconnu"
 #: lib/jabber.php:192
 #, php-format
 msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -4120,13 +4220,16 @@ msgstr "Créer un nouveau compte"
 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr "L'accès à cette boîte de réception est réservé à son utilisateur."
+msgstr "L’accès à cette boîte de réception est réservé à son utilisateur."
 
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"Vous n’avez pas de messages privés. Vous pouvez envoyer des messages privés "
+"pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
+"vous envoyer des messages destinés à vous seul(e)."
 
 #: lib/mailbox.php:227 lib/noticelist.php:424
 msgid "from"
@@ -4134,7 +4237,7 @@ msgstr "de"
 
 #: lib/mail.php:172
 msgid "Email address confirmation"
-msgstr "Confirmation de l'adresse courriel"
+msgstr "Confirmation de l’adresse courriel"
 
 #: lib/mail.php:174
 #, php-format
@@ -4172,7 +4275,7 @@ msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s suit maintenant vos statuts dans %2$s."
 
 #: lib/mail.php:240
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -4185,12 +4288,16 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s suit maintenant vos statuts dans %2$s.\n"
+"%1$s suit maintenant vos statuts sur %2$s.\n"
 "\n"
-"\t%3$s\n"
+"%3$s\n"
 "\n"
+"%4$s%5$s%6$s\n"
 "Cordialement,\n"
-"%4$s.\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Changez votre adresse de courriel ou vos options de notification sur %8$s\n"
 
 #: lib/mail.php:253
 #, php-format
@@ -4233,7 +4340,7 @@ msgstr ""
 "\n"
 "Écrivez à %2$s pour mettre à jour votre statut.\n"
 "\n"
-"Plus d'info : %3$s.\n"
+"Plus d’info : %3$s.\n"
 "\n"
 "Amicalement vôtre,\n"
 "%4$s"
@@ -4250,7 +4357,7 @@ msgstr "Confirmation SMS"
 #: lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "Vous avez reçu un clin d'œil de %s"
+msgstr "Vous avez reçu un clin d’œil de %s"
 
 #: lib/mail.php:466
 #, php-format
@@ -4267,6 +4374,17 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
+"%1$s (%2$s) se demande ce que vous devenez ces temps-ci et vous invite à "
+"publier des nouvelles.\n"
+"\n"
+"Donc on vous écoute :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
+"\n"
+"Bien à vous,\n"
+"%4$s\n"
 
 #: lib/mail.php:509
 #, php-format
@@ -4291,11 +4409,25 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
+"%1$s (%2$s) vous a envoyé un message privé:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"Vous pouvez répondre à ce message ici:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Ne répondez pas à ce courriel ; il ne sera pas envoyé.\n"
+"\n"
+"Bien à vous,\n"
+"%5$s\n"
 
 #: lib/mail.php:554
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s a ajouté un de vos messages à ses favoris"
+msgstr "%s (@%s) a ajouté un de vos statut à ses favoris"
 
 #: lib/mail.php:556
 #, fuzzy, php-format
@@ -4334,7 +4466,7 @@ msgstr ""
 #: lib/mail.php:611
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) vous a envoyé un avis"
 
 #: lib/mail.php:613
 #, php-format
@@ -4350,24 +4482,38 @@ msgid ""
 "\t%4$s\n"
 "\n"
 msgstr ""
+"%1$s (@%9$s) vient de vous envoyer un avis (une réponse « @ ») sur %2$s.\n"
+"\n"
+"L’avis est là :\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"Il dit :\n"
+"\n"
+"\t%4$s\n"
+"\n"
 
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
+"Une erreur de base de données s’est produite pendant la sauvegarde de votre "
+"fichier. Veuillez réessayer."
 
 #: lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "Le fichier importé dépasse le réglage upload_max_filesize de php.ini."
 
 #: lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
+"Le fichier importé dépasse le réglage MAX_FILE_SIZE qui a été précisé dans "
+"le formulaire HTML."
 
 #: lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "Le fichier n’a été que partiellement importé."
 
 #: lib/mediafile.php:159
 msgid "Missing a temporary folder."
@@ -4379,29 +4525,29 @@ msgstr "Impossible d'écrire sur le disque."
 
 #: lib/mediafile.php:165
 msgid "File upload stopped by extension."
-msgstr ""
+msgstr "Import de fichier stoppé par une extension."
 
 #: lib/mediafile.php:179 lib/mediafile.php:216
 msgid "File exceeds user's quota!"
-msgstr ""
+msgstr "Le fichier dépasse le quota de l’utilisateur."
 
 #: lib/mediafile.php:196 lib/mediafile.php:233
 msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "Le fichier n’a pas pu être déplacé dans le dossier de destination."
 
 #: lib/mediafile.php:201 lib/mediafile.php:237
 msgid "Could not determine file's mime-type!"
-msgstr "Impossible de récupérer le flux public."
+msgstr "Impossible de déterminer le mime-type du fichier !"
 
 #: lib/mediafile.php:270
 #, php-format
 msgid " Try using another %s format."
-msgstr ""
+msgstr " Essayez d’utiliser un autre %s format."
 
 #: lib/mediafile.php:275
 #, php-format
 msgid "%s is not a supported filetype on this server."
-msgstr ""
+msgstr "%s n’est pas un type de fichier supporté sur ce serveur."
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
@@ -4409,7 +4555,7 @@ msgstr "Envoyer un message direct"
 
 #: lib/messageform.php:146
 msgid "To"
-msgstr "À "
+msgstr "À"
 
 #: lib/messageform.php:162 lib/noticeform.php:173
 msgid "Available characters"
@@ -4446,35 +4592,35 @@ msgstr "Répondre"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
-msgstr "Envoyer un clin d'œil à cet utilisateur"
+msgstr "Envoyer un clin d’œil à cet utilisateur"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
-msgstr "Clin d'œil"
+msgstr "Clin d’œil"
 
 #: lib/nudgeform.php:128
 msgid "Send a nudge to this user"
-msgstr "Envoyer un clin d'œil à cet utilisateur"
+msgstr "Envoyer un clin d’œil à cet utilisateur"
 
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
-msgstr "Erreur lors de l'insertion du nouveau profil"
+msgstr "Erreur lors de l’insertion du nouveau profil"
 
 #: lib/oauthstore.php:291
 msgid "Error inserting avatar"
-msgstr "Erreur lors de l'insertion de l'avatar"
+msgstr "Erreur lors de l’insertion de l’avatar"
 
 #: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
-msgstr "Erreur lors de l'insertion du profil distant"
+msgstr "Erreur lors de l’insertion du profil distant"
 
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
-msgstr "Dupliquer l'avis"
+msgstr "Dupliquer l’avis"
 
 #: lib/oauthstore.php:487
 msgid "Couldn't insert new subscription."
-msgstr "Impossible d'insérer un nouvel abonnement."
+msgstr "Impossible d’insérer un nouvel abonnement."
 
 #: lib/personalgroupnav.php:99
 msgid "Personal"
@@ -4502,7 +4648,7 @@ msgstr "Vos messages reçus"
 
 #: lib/personalgroupnav.php:129
 msgid "Outbox"
-msgstr "Boîte d'envoi"
+msgstr "Boîte d’envoi"
 
 #: lib/personalgroupnav.php:130
 msgid "Your sent messages"
@@ -4531,7 +4677,7 @@ msgstr "Tous les abonnés"
 
 #: lib/profileaction.php:177
 msgid "User ID"
-msgstr "ID de l'utilisateur"
+msgstr "ID de l’utilisateur"
 
 #: lib/profileaction.php:182
 msgid "Member since"
@@ -4547,7 +4693,7 @@ msgstr "Public"
 
 #: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr "Groupes d'utilisateurs"
+msgstr "Groupes d’utilisateurs"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
@@ -4636,20 +4782,19 @@ msgstr "Cet utilisateur vous a bloqué."
 
 #: lib/subs.php:56
 msgid "Could not subscribe."
-msgstr "Impossible de s'abonner."
+msgstr "Impossible de s’abonner."
 
 #: lib/subs.php:75
 msgid "Could not subscribe other to you."
-msgstr "Impossible d'abonner une autre personne à votre profil."
+msgstr "Impossible d’abonner une autre personne à votre profil."
 
 #: lib/subs.php:124
-#, fuzzy
 msgid "Not subscribed!"
 msgstr "Pas abonné !"
 
 #: lib/subs.php:136
 msgid "Couldn't delete subscription."
-msgstr "Impossible de cesser l'abonnement"
+msgstr "Impossible de cesser l’abonnement"
 
 #: lib/tagcloudsection.php:56
 msgid "None"
@@ -4669,11 +4814,11 @@ msgstr "Désabonnement"
 
 #: lib/userprofile.php:116
 msgid "Edit Avatar"
-msgstr "Modifier l'avatar"
+msgstr "Modifier l’avatar"
 
 #: lib/userprofile.php:236
 msgid "User actions"
-msgstr "Actions de l'utilisateur"
+msgstr "Actions de l’utilisateur"
 
 #: lib/userprofile.php:248
 msgid "Edit profile settings"
@@ -4689,11 +4834,11 @@ msgstr "Envoyer un message à cet utilisateur"
 
 #: lib/userprofile.php:273
 msgid "Message"
-msgstr "Message "
+msgstr "Message"
 
 #: lib/util.php:821
 msgid "a few seconds ago"
-msgstr "il y a quelques secondes "
+msgstr "il y a quelques secondes"
 
 #: lib/util.php:823
 msgid "about a minute ago"
@@ -4738,13 +4883,13 @@ msgstr "il y a environ 1 an"
 #: lib/webcolor.php:82
 #, php-format
 msgid "%s is not a valid color!"
-msgstr "&s n'est pas une couleur valide !"
+msgstr "&s n’est pas une couleur valide !"
 
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-"%s n'est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
+"%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
 
 #: scripts/maildaemon.php:48
 msgid "Could not parse message."
@@ -4752,12 +4897,12 @@ msgstr "Impossible de déchiffrer ce message."
 
 #: scripts/maildaemon.php:53
 msgid "Not a registered user."
-msgstr "Ceci n'est pas un utilisateur inscrit."
+msgstr "Ceci n’est pas un utilisateur inscrit."
 
 #: scripts/maildaemon.php:57
 msgid "Sorry, that is not your incoming email address."
-msgstr "Désolé, ceci n'est pas votre adresse de courriel entrant."
+msgstr "Désolé, ceci n’est pas votre adresse de courriel entrant."
 
 #: scripts/maildaemon.php:61
 msgid "Sorry, no incoming email allowed."
-msgstr "Désolé, la réception de courriels n'est pas permise. "
+msgstr "Désolé, la réception de courriels n’est pas permise."
diff --git a/locale/ga/LC_MESSAGES/statusnet.mo b/locale/ga/LC_MESSAGES/statusnet.mo
index fa63d16af..78a0e7ba0 100644
--- a/locale/ga/LC_MESSAGES/statusnet.mo
+++ b/locale/ga/LC_MESSAGES/statusnet.mo
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index edbe981a2..bce6ff40a 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:42+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:30+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
@@ -3673,21 +3673,21 @@ msgstr "Todos"
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« Despois"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
@@ -3863,7 +3863,37 @@ msgstr "Non se pode crear o formulario OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Outro usuario non se puido suscribir a ti."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Suscrito a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Non estás suscrito a ese perfil"
+
+#: lib/command.php:670
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -3871,6 +3901,9 @@ msgid ""
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3926,20 +3959,20 @@ msgstr ""
 "tracks - non implementado por agora.\n"
 "tracking - non implementado por agora.\n"
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Sen código de confirmación."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/he/LC_MESSAGES/statusnet.mo b/locale/he/LC_MESSAGES/statusnet.mo
index 51329ffd0..57b3fb49f 100644
--- a/locale/he/LC_MESSAGES/statusnet.mo
+++ b/locale/he/LC_MESSAGES/statusnet.mo
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index af4ad9aae..3de5c0072 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:45+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:33+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -3541,21 +3541,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "<< אחרי"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "לפני >>"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3727,13 +3727,46 @@ msgstr "נכשלה יצירת OpenID מתוך: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "הרשמה מרוחקת"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "הרשמה מרוחקת"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "לא שלחנו אלינו את הפרופיל הזה"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3763,20 +3796,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "אין קוד אישור."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/is/LC_MESSAGES/statusnet.mo b/locale/is/LC_MESSAGES/statusnet.mo
index bf148d7fa..0d3848efd 100644
--- a/locale/is/LC_MESSAGES/statusnet.mo
+++ b/locale/is/LC_MESSAGES/statusnet.mo
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 86be2cf8b..e871d86a5 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:49+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:36+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -3554,19 +3554,19 @@ msgstr "Allt "
 msgid "license."
 msgstr "leyfi."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Uppröðun"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Eftir"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Áður"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
 
@@ -3737,13 +3737,46 @@ msgstr "Gat ekki búið til OpenID eyðublað: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Þú ert ekki áskrifandi."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Þú ert ekki áskrifandi."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Fólk sem eru áskrifendur að %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Þú ert ekki meðlimur í þessum hópi."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3773,20 +3806,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Enginn staðfestingarlykill."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Skrá þig inn á síðuna"
diff --git a/locale/it/LC_MESSAGES/statusnet.mo b/locale/it/LC_MESSAGES/statusnet.mo
index a215ac0ac..479d105b0 100644
--- a/locale/it/LC_MESSAGES/statusnet.mo
+++ b/locale/it/LC_MESSAGES/statusnet.mo
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 03d397b52..231078cc7 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -1,16 +1,17 @@
 # Translation of StatusNet to Italian
 #
+# Author@translatewiki.net: Nemo bis
 # --
 msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:52+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:39+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -3615,19 +3616,19 @@ msgstr "Tutto "
 msgid "license."
 msgstr "licenza."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginazione"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Successivi"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Precedenti"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "C'è stato un problema con il tuo token di sessione."
 
@@ -3799,13 +3800,46 @@ msgstr "Impossibile creare il modulo OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Non sei abbonato a quel profilo."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Non sei abbonato a quel profilo."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Impossibile abbonare altri a te."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Persone abbonate a %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Non sei un membro di quel gruppo."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Non sei un membro di quel gruppo."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3835,20 +3869,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Nessun codice di conferma."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Accedi al sito"
@@ -4414,7 +4448,7 @@ msgstr "Invia un messaggio"
 #: lib/noticeform.php:158
 #, php-format
 msgid "What's up, %s?"
-msgstr "Cosa succede %s?"
+msgstr "Cosa succede, %s?"
 
 #: lib/noticeform.php:180
 msgid "Attach"
diff --git a/locale/ja/LC_MESSAGES/statusnet.mo b/locale/ja/LC_MESSAGES/statusnet.mo
index 91a049b32..3fd89d064 100644
--- a/locale/ja/LC_MESSAGES/statusnet.mo
+++ b/locale/ja/LC_MESSAGES/statusnet.mo
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index f75460079..eb63104c8 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:55+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:42+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -3576,21 +3576,21 @@ msgstr ""
 msgid "license."
 msgstr "ライセンス。"
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "<< 前"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "前 >>"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3762,13 +3762,46 @@ msgstr "OpenIDを作成できません : %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "そのプロファイルは送信されていません。"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "そのプロファイルは送信されていません。"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "リモートサブスクライブ"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "リモートサブスクライブ"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "そのプロファイルは送信されていません。"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "そのプロファイルは送信されていません。"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3798,20 +3831,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "確認コードがありません。"
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "サイトへログイン"
diff --git a/locale/ko/LC_MESSAGES/statusnet.mo b/locale/ko/LC_MESSAGES/statusnet.mo
index ad6a2eca8..870956380 100644
--- a/locale/ko/LC_MESSAGES/statusnet.mo
+++ b/locale/ko/LC_MESSAGES/statusnet.mo
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 9c25104ac..19a9f4a6e 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:42:57+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:45+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -3580,19 +3580,19 @@ msgstr "모든 것"
 msgid "license."
 msgstr "라이선스"
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "페이지수"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "뒷 페이지"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "앞 페이지"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "당신의 세션토큰관련 문제가 있습니다."
 
@@ -3764,13 +3764,46 @@ msgstr "OpenID를 작성 할 수 없습니다 : %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "다른 사람을 구독 하실 수 없습니다."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "%s에 의해 구독되는 사람들"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3800,20 +3833,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "확인 코드가 없습니다."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "이 사이트 로그인"
diff --git a/locale/mk/LC_MESSAGES/statusnet.mo b/locale/mk/LC_MESSAGES/statusnet.mo
index cce86e74d..6b2713593 100644
--- a/locale/mk/LC_MESSAGES/statusnet.mo
+++ b/locale/mk/LC_MESSAGES/statusnet.mo
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 01d416fa1..d011d7379 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:00+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:48+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -3552,21 +3552,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« Следни"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Предходни »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3738,13 +3738,46 @@ msgstr "OpenID формуларот не може да се креира:%s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Не ни го испративте тој профил."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Не ни го испративте тој профил."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Оддалечена претплата"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Оддалечена претплата"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Не ни го испративте тој профил."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Не ни го испративте тој профил."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3774,20 +3807,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Нема код за потврда."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/nb/LC_MESSAGES/statusnet.mo b/locale/nb/LC_MESSAGES/statusnet.mo
index 15f13ca51..ee9dea03a 100644
--- a/locale/nb/LC_MESSAGES/statusnet.mo
+++ b/locale/nb/LC_MESSAGES/statusnet.mo
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index d0c4ea124..0ced02905 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:03+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:51+0000\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -3516,20 +3516,20 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Tidligere »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3700,13 +3700,46 @@ msgstr "Klarte ikke å lagre avatar-informasjonen"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Ikke autorisert."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Svar til %s"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Svar til %s"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Svar til %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du er allerede logget inn!"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du er allerede logget inn!"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3736,20 +3769,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Fant ikke bekreftelseskode."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/nl/LC_MESSAGES/statusnet.mo b/locale/nl/LC_MESSAGES/statusnet.mo
index 4fcdabaed..ff15e5ade 100644
--- a/locale/nl/LC_MESSAGES/statusnet.mo
+++ b/locale/nl/LC_MESSAGES/statusnet.mo
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 438a4e424..2f3944f4e 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:09+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:59+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -3683,19 +3683,19 @@ msgstr "Alle "
 msgid "license."
 msgstr "licentie."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginering"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Na"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Voor"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Er is een probleem met uw sessietoken."
 
@@ -3875,13 +3875,47 @@ msgstr ""
 "Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
 "geldig: %s"
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "U bent niet geabonneerd op dat profiel."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "U bent niet geabonneerd op dat profiel."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Gebruikers met een abonnement op %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "U bent geen lid van deze groep"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "U bent geen lid van deze groep."
+
+#: lib/command.php:670
+#, fuzzy
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3945,20 +3979,20 @@ msgstr ""
 "tracks - nog niet beschikbaar\n"
 "tracking - nog niet beschikbaar\n"
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr "Er is geen instellingenbestand aangetroffen. "
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr "Er is gezocht naar instellingenbestanden op de volgende plaatsen: "
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 "U kunt proberen de installer uit te voeren om dit probleem op te lossen."
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr "Naar het installatieprogramma gaan."
 
@@ -4819,7 +4853,6 @@ msgid "Could not subscribe other to you."
 msgstr "Het was niet mogelijk om een ander op u te laten abonneren"
 
 #: lib/subs.php:124
-#, fuzzy
 msgid "Not subscribed!"
 msgstr "Niet geabonneerd!"
 
diff --git a/locale/nn/LC_MESSAGES/statusnet.mo b/locale/nn/LC_MESSAGES/statusnet.mo
index d6fc4c4ca..abb9b6191 100644
--- a/locale/nn/LC_MESSAGES/statusnet.mo
+++ b/locale/nn/LC_MESSAGES/statusnet.mo
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 872f4eed0..7dcdcb0df 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:05+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:43:54+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
@@ -3596,19 +3596,19 @@ msgstr "Alle"
 msgid "license."
 msgstr "lisens."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginering"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "« Etter"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Før »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
@@ -3780,13 +3780,46 @@ msgstr "Kunne ikkje laga OpenID-form: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Du tingar ikkje oppdateringar til den profilen."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Kan ikkje tinga andre til deg."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Mennesker som tingar %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du er ikkje medlem av den gruppa."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3816,20 +3849,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Ingen stadfestingskode."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Logg inn or sida"
diff --git a/locale/pl/LC_MESSAGES/statusnet.mo b/locale/pl/LC_MESSAGES/statusnet.mo
index 2303f0fb2..d3ab4e974 100644
--- a/locale/pl/LC_MESSAGES/statusnet.mo
+++ b/locale/pl/LC_MESSAGES/statusnet.mo
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index e6c3ab182..94fb477f1 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:13+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:02+0000\n"
 "Language-Team: Polish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -3662,19 +3662,19 @@ msgstr "Wszystko "
 msgid "license."
 msgstr "licencja."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginacja"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Następne"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Wcześniej"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Wystąpił problem z tokenem sesji."
 
@@ -3848,7 +3848,37 @@ msgstr "Nie można utworzyć formularza OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Nie jesteś zasubskrybowany do tego profilu."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Nie jesteś zasubskrybowany do tego profilu."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Nie można zasubskrybować innych do Ciebie."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Osoby zasubskrybowane do %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Nie jesteś członkiem tej grupy."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Nie jesteś członkiem tej grupy."
+
+#: lib/command.php:670
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -3856,6 +3886,9 @@ msgid ""
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3911,20 +3944,20 @@ msgstr ""
 "tracks - jeszcze nie zaimplementowano.\n"
 "tracking - jeszcze nie zaimplementowano.\n"
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Brak kodu potwierdzającego."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Zaloguj się na stronę"
diff --git a/locale/pt/LC_MESSAGES/statusnet.mo b/locale/pt/LC_MESSAGES/statusnet.mo
index 77ba0509a..9d79df32c 100644
--- a/locale/pt/LC_MESSAGES/statusnet.mo
+++ b/locale/pt/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index bdcc66468..4577be669 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:15+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:05+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -3507,20 +3507,20 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Antes »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3692,13 +3692,44 @@ msgstr "Não foi possível criar o formulário de OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Não foi possível subscrever outros a si."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Já subscrito!."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Não foi possível subscrever outros a si."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Já subscrito!."
+
+#: lib/command.php:656
+msgid "You are not a member of any groups."
+msgstr ""
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
+msgstr ""
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3728,20 +3759,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Código de confirmação não encontrado"
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.mo b/locale/pt_BR/LC_MESSAGES/statusnet.mo
index 58f25061d..634c68c24 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.mo
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.mo
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index d724f79b1..73b63476b 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:18+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:09+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -3656,19 +3656,19 @@ msgstr "Todas"
 msgid "license."
 msgstr "licença"
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Paginação"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Próximo"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Anterior"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 "Ocorreu um problema com o seu token de sessão. Tente novamente, por favor."
@@ -3844,13 +3844,46 @@ msgstr "Não foi possível criar o formulário OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Não foi possível fazer com que o outros o sigam."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Assinantes de %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Você não está assinando esse perfil."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3880,20 +3913,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Nenhum código de confirmação."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Entrar"
diff --git a/locale/ru/LC_MESSAGES/statusnet.mo b/locale/ru/LC_MESSAGES/statusnet.mo
index 2ee87e9be..13d14c0f9 100644
--- a/locale/ru/LC_MESSAGES/statusnet.mo
+++ b/locale/ru/LC_MESSAGES/statusnet.mo
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 9c876cddf..521b67091 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -6,21 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:20+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:12+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
 
 #: actions/all.php:63 actions/public.php:97 actions/replies.php:92
 #: actions/showfavorites.php:137 actions/tag.php:51
-#, fuzzy
 msgid "No such page"
-msgstr "Нет такого тега."
+msgstr "Нет такой страницы"
 
 #: actions/all.php:74 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:113
@@ -3651,19 +3650,19 @@ msgstr "Все"
 msgid "license."
 msgstr "лицензия."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Пагинация"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Сюда"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Туда"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
 
@@ -3835,13 +3834,46 @@ msgstr "Не удаётся создать OpenID-форму: %s "
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Вы не подписаны на этот профиль."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Вы не подписаны на этот профиль."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Не удаётся подписать других на вашу ленту."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Люди подписанные на %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Вы не являетесь членом этой группы."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Вы не являетесь членом этой группы."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3871,20 +3903,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Нет кода подтверждения."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Войти"
diff --git a/locale/statusnet.po b/locale/statusnet.po
index 448ab4fa5..0d0ea85f6 100644
--- a/locale/statusnet.po
+++ b/locale/statusnet.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3392,19 +3392,19 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr ""
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3574,13 +3574,40 @@ msgstr ""
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+msgid "You are not subscribed to anyone."
+msgstr ""
+
+#: lib/command.php:620
+msgid "You are subscribed to these people: "
+msgstr ""
+
+#: lib/command.php:637
+msgid "No one is subscribed to you."
+msgstr ""
+
+#: lib/command.php:639
+msgid "These people are subscribed to you: "
+msgstr ""
+
+#: lib/command.php:656
+msgid "You are not a member of any groups."
+msgstr ""
+
+#: lib/command.php:658
+msgid "You are a member of these groups: "
+msgstr ""
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3610,19 +3637,19 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 msgid "No configuration file found. "
 msgstr ""
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.mo b/locale/sv/LC_MESSAGES/statusnet.mo
index 93760fe39..ed78309b1 100644
--- a/locale/sv/LC_MESSAGES/statusnet.mo
+++ b/locale/sv/LC_MESSAGES/statusnet.mo
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 514a2e0fa..437c4b244 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:23+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:15+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -3647,21 +3647,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« Nyare"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Tidigare »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Det var något problem med din session. Försök igen, tack."
@@ -3834,13 +3834,46 @@ msgstr "Kan inte skapa OpenID formulär: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Du skickade inte oss den profilen"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Du skickade inte oss den profilen"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Kunde inte prenumerera på annat åt dig."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Fjärrprenumerera"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Du skickade inte oss den profilen"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Du skickade inte oss den profilen"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3870,20 +3903,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Ingen bekräftelsekod."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/te/LC_MESSAGES/statusnet.mo b/locale/te/LC_MESSAGES/statusnet.mo
index 2b70c53f2..059365e86 100644
--- a/locale/te/LC_MESSAGES/statusnet.mo
+++ b/locale/te/LC_MESSAGES/statusnet.mo
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 04a21fe1b..b45d8a5a9 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -6,12 +6,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:25+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:17+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -76,7 +76,7 @@ msgstr "%s యొక్క మిత్రుల ఫీడు (ఆటమ్)"
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
-msgstr ""
+msgstr "ఇది %s మరియు మిత్రుల కాలరేఖ కానీ ఇంకా ఎవరూ ఏమీ రాయలేదు."
 
 #: actions/all.php:132
 #, php-format
@@ -246,9 +246,8 @@ msgid "No status found with that ID."
 msgstr ""
 
 #: actions/apifavoritecreate.php:119
-#, fuzzy
 msgid "This status is already a favorite!"
-msgstr "అది ఇప్పటికే మీ ఈమెయిల్ చిరునామా."
+msgstr "ఈ నోటీసు ఇప్పటికే మీ ఇష్టాంశం!"
 
 #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
 msgid "Could not create favorite."
@@ -807,7 +806,7 @@ msgstr ""
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
-msgstr ""
+msgstr "ఇష్టాంశాలకు చేర్చు"
 
 #: actions/doc.php:69
 msgid "No such document."
@@ -1061,7 +1060,7 @@ msgstr ""
 #: lib/personalgroupnav.php:115
 #, php-format
 msgid "%s's favorite notices"
-msgstr ""
+msgstr "%sకి ఇష్టమైన నోటీసులు"
 
 #: actions/favoritesrss.php:115
 #, fuzzy, php-format
@@ -1151,9 +1150,8 @@ msgid "No such file."
 msgstr "అటువంటి ఫైలు లేదు."
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "Cannot read file."
-msgstr "అటువంటి సందేశమేమీ లేదు."
+msgstr "ఫైలుని చదవలేకపోతున్నాం."
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
@@ -1162,7 +1160,7 @@ msgstr ""
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
-msgstr ""
+msgstr "నిర్వాహకులు మాత్రమే గుంపు సభ్యులను నిరోధించగలరు."
 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."
@@ -1170,12 +1168,11 @@ msgstr "వాడుకరిని ఇప్పటికే గుంపున�
 
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
-msgstr ""
+msgstr "వాడుకరి ఈ గుంపులో సభ్యులు కాదు."
 
 #: actions/groupblock.php:136 actions/groupmembers.php:314
-#, fuzzy
 msgid "Block user from group"
-msgstr "అటువంటి వాడుకరి లేరు."
+msgstr "వాడుకరిని గుంపు నుండి నిరోధించు"
 
 #: actions/groupblock.php:162
 #, php-format
@@ -1204,7 +1201,7 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "గుంపుని మార్చడానికి మీరు ప్రవేశించి ఉండాలి."
 
 #: actions/groupdesignsettings.php:141
 msgid "Group design"
@@ -1610,7 +1607,7 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ�
 #: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
-msgstr ""
+msgstr "%2$s గుంపు నుండి %1$s వైదొలిగారు"
 
 #: actions/login.php:79 actions/register.php:137
 msgid "Already logged in."
@@ -2011,14 +2008,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "మీ హోమ్ పేజీ, బ్లాగు, లేదా వేరే సేటులోని మీ ప్రొఫైలు యొక్క చిరునామా"
 
 #: actions/profilesettings.php:122 actions/register.php:460
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
+msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి %d అక్షరాల్లో చెప్పండి"
 
 #: actions/profilesettings.php:125 actions/register.php:463
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి 140 అక్షరాల్లో చెప్పండి"
+msgstr "మీ గురించి మరియు మీ ఆసక్తుల గురించి చెప్పండి"
 
 #: actions/profilesettings.php:127 actions/register.php:465
 msgid "Bio"
@@ -2242,7 +2238,7 @@ msgstr ""
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
-msgstr ""
+msgstr "ముద్దుపేరు లేదా ఈమెయిలు చిరునామా"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -2320,7 +2316,7 @@ msgstr "మీ కొత్త సంకేతపదం భద్రమైంద
 
 #: actions/register.php:85 actions/register.php:189 actions/register.php:404
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "క్షమించండి, ఆహ్వానితులు మాత్రమే నమోదుకాగలరు."
 
 #: actions/register.php:92
 #, fuzzy
@@ -2372,7 +2368,7 @@ msgstr "6 లేదా అంతకంటే ఎక్కువ అక్షర�
 
 #: actions/register.php:433
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "పై సంకేతపదం మరోసారి. తప్పనిసరి."
 
 #: actions/register.php:437 actions/register.php:441
 #: lib/accountsettingsaction.php:120
@@ -2385,7 +2381,7 @@ msgstr "తాజా విశేషాలు, ప్రకటనలు, మర�
 
 #: actions/register.php:449
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "పొడుగాటి పేరు, మీ \"అసలు\" పేరైతే మంచిది"
 
 #: actions/register.php:493
 msgid "My text and files are available under "
@@ -3427,13 +3423,13 @@ msgid "StatusNet software license"
 msgstr ""
 
 #: lib/action.php:767
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%). "
 msgstr ""
-"[%%site.broughtby%%](%%site.broughtbyurl%%) వారు అందిస్తున్న ఈ **%%site.name%%** "
-"అనేది మైక్రో బ్లాగింగు సదుపాయం."
+"**%%site.name%%** అనేది [%%site.broughtby%%](%%site.broughtbyurl%%) వారు "
+"అందిస్తున్న మైక్రో బ్లాగింగు సదుపాయం. "
 
 #: lib/action.php:769
 #, php-format
@@ -3447,6 +3443,9 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
+"ఇది [గ్నూ ఆఫెరో జెనరల్ పబ్లిక్ లైసెన్సు](http://www.fsf.org/licensing/licenses/agpl-3.0."
+"html) కింద లభ్యమయ్యే [స్టేటస్&zwnj;నెట్](http://status.net/) మైక్రోబ్లాగింగ్ ఉపకరణం సంచిక %s "
+"పై నడుస్తుంది."
 
 #: lib/action.php:785
 #, fuzzy
@@ -3461,19 +3460,19 @@ msgstr "అన్నీ "
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "పేజీకరణ"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "తర్వాత"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "ఇంతక్రితం"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3588,7 +3587,7 @@ msgstr ""
 #: lib/command.php:431
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "నోటిసు చాలా పొడవుగా ఉంది - %d అక్షరాలు గరిష్ఠం, మీరు %d పంపించారు"
 
 #: lib/command.php:439
 #, fuzzy, php-format
@@ -3648,13 +3647,46 @@ msgstr "ఓపెన్ఐడీ ఫారమును సృష్టించ�
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "%sకి స్పందనలు"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "%sకి స్పందనలు"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "%sకి స్పందనలు"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "%sకి స్పందనలు"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "మీరు ఇప్పటికే లోనికి ప్రవేశించారు!"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3684,20 +3716,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "నిర్ధారణ సంకేతం లేదు."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
@@ -4359,9 +4391,8 @@ msgid "All subscribers"
 msgstr "అందరు చందాదార్లు"
 
 #: lib/profileaction.php:177
-#, fuzzy
 msgid "User ID"
-msgstr "వాడుకరి"
+msgstr "వాడుకరి ID"
 
 #: lib/profileaction.php:182
 msgid "Member since"
@@ -4443,7 +4474,7 @@ msgstr "%sకి స్పందనలు"
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
-msgstr ""
+msgstr "%s సభ్యులుగా ఉన్న గుంపులు"
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -4464,9 +4495,8 @@ msgid "Already subscribed!"
 msgstr ""
 
 #: lib/subs.php:52
-#, fuzzy
 msgid "User has blocked you."
-msgstr "వాడుకరికి ప్రొఫైలు లేదు."
+msgstr "వాడుకరి మిమ్మల్ని నిరోధించారు."
 
 #: lib/subs.php:56
 msgid "Could not subscribe."
@@ -4499,7 +4529,7 @@ msgstr ""
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
-msgstr ""
+msgstr "చందామాను"
 
 #: lib/userprofile.php:116
 msgid "Edit Avatar"
@@ -4571,9 +4601,9 @@ msgid "about a year ago"
 msgstr "ఒక సంవత్సరం క్రితం"
 
 #: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color!"
-msgstr "హోమ్ పేజీ URL సరైనది కాదు."
+msgstr "%s అనేది సరైన రంగు కాదు!"
 
 #: lib/webcolor.php:123
 #, php-format
diff --git a/locale/tr/LC_MESSAGES/statusnet.mo b/locale/tr/LC_MESSAGES/statusnet.mo
index 1ee9548bc..84e32897a 100644
--- a/locale/tr/LC_MESSAGES/statusnet.mo
+++ b/locale/tr/LC_MESSAGES/statusnet.mo
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index cd84e1bd9..78261edbb 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:28+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:20+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
@@ -3547,21 +3547,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« Sonra"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Önce »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3733,13 +3733,46 @@ msgstr "OpenID formu yaratılamadı: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Bize o profili yollamadınız"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Bize o profili yollamadınız"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Uzaktan abonelik"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Uzaktan abonelik"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Bize o profili yollamadınız"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Bize o profili yollamadınız"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3769,20 +3802,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Onay kodu yok."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/uk/LC_MESSAGES/statusnet.mo b/locale/uk/LC_MESSAGES/statusnet.mo
index fa541313f..9cbb4440f 100644
--- a/locale/uk/LC_MESSAGES/statusnet.mo
+++ b/locale/uk/LC_MESSAGES/statusnet.mo
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 3c803427b..2c54591aa 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:31+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:23+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -3627,19 +3627,19 @@ msgstr "Всі "
 msgid "license."
 msgstr "ліцензія."
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "Нумерація сторінок"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr "Вперед"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 msgid "Before"
 msgstr "Назад"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr "Виникли певні проблеми з токеном поточної сесії."
 
@@ -3811,13 +3811,46 @@ msgstr "Не вдалося створити форму OpenID: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Ви не підписані до цього профілю."
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Ви не підписані до цього профілю."
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Не вдалося підписати іншого до вас."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Люди підписані до %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Ви не є учасником цієї групи."
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Ви не є учасником цієї групи."
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3847,20 +3880,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Немає коду підтвердження."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "Увійти на сайт"
diff --git a/locale/vi/LC_MESSAGES/statusnet.mo b/locale/vi/LC_MESSAGES/statusnet.mo
index 1b6b7f268..0480dfd01 100644
--- a/locale/vi/LC_MESSAGES/statusnet.mo
+++ b/locale/vi/LC_MESSAGES/statusnet.mo
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 0c6fd586b..c0616649e 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -5,12 +5,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:33+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:26+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -3687,21 +3687,21 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "Sau"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "Trước"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
@@ -3881,13 +3881,46 @@ msgstr "Không thể tạo OpenID mẫu: %s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "Không thể tạo favorite."
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "Theo nhóm này"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "Bạn chưa cập nhật thông tin riêng"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3917,20 +3950,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "Không có mã số xác nhận."
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 18493304d..4fd7cd1dc 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index d64c07436..722af7d34 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:36+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:29+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -3607,21 +3607,21 @@ msgstr "全部"
 msgid "license."
 msgstr "注册证"
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr "分页"
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 #, fuzzy
 msgid "After"
 msgstr "« 之后"
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "之前 »"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "会话标识有问题，请重试。"
@@ -3794,13 +3794,46 @@ msgstr "无法创建 OpenID 表单：%s"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "无法订阅他人更新。"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "订阅 %s"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3830,20 +3863,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "没有验证码"
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 #, fuzzy
 msgid "Go to the installer."
 msgstr "登入本站"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.mo b/locale/zh_TW/LC_MESSAGES/statusnet.mo
index d9cef9e4e..0db278848 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 3bc2ebbd6..d251d4aa4 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-13 20:42+0000\n"
-"PO-Revision-Date: 2009-11-13 20:43:38+0000\n"
+"POT-Creation-Date: 2009-11-16 19:42+0000\n"
+"PO-Revision-Date: 2009-11-16 19:44:31+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r59023); Translate extension (2009-11-13)\n"
+"X-Generator: MediaWiki 1.16alpha(r59142); Translate extension (2009-11-13)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -3484,20 +3484,20 @@ msgstr ""
 msgid "license."
 msgstr ""
 
-#: lib/action.php:1053
+#: lib/action.php:1052
 msgid "Pagination"
 msgstr ""
 
-#: lib/action.php:1062
+#: lib/action.php:1061
 msgid "After"
 msgstr ""
 
-#: lib/action.php:1070
+#: lib/action.php:1069
 #, fuzzy
 msgid "Before"
 msgstr "之前的內容»"
 
-#: lib/action.php:1119
+#: lib/action.php:1117
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -3667,13 +3667,46 @@ msgstr "無法從 %s 建立OpenID"
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:613
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "此帳號已註冊"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to these people: "
+msgstr "此帳號已註冊"
+
+#: lib/command.php:637
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "無此訂閱"
+
+#: lib/command.php:639
+#, fuzzy
+msgid "These people are subscribed to you: "
+msgstr "此帳號已註冊"
+
+#: lib/command.php:656
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "無法連結到伺服器:%s"
+
+#: lib/command.php:658
+#, fuzzy
+msgid "You are a member of these groups: "
+msgstr "無法連結到伺服器:%s"
+
+#: lib/command.php:670
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 "off - turn off notifications\n"
 "help - show this help\n"
 "follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
 "leave <nickname> - unsubscribe from user\n"
 "d <nickname> <text> - direct message to user\n"
 "get <nickname> - get last notice from user\n"
@@ -3703,20 +3736,20 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:189
+#: lib/common.php:192
 #, fuzzy
 msgid "No configuration file found. "
 msgstr "無確認碼"
 
-#: lib/common.php:190
+#: lib/common.php:193
 msgid "I looked for configuration files in the following places: "
 msgstr ""
 
-#: lib/common.php:191
+#: lib/common.php:194
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:192
+#: lib/common.php:195
 msgid "Go to the installer."
 msgstr ""
 
diff --git a/plugins/Authentication/AuthenticationPlugin.php b/plugins/Authentication/AuthenticationPlugin.php
index a76848b04..1b9084187 100644
--- a/plugins/Authentication/AuthenticationPlugin.php
+++ b/plugins/Authentication/AuthenticationPlugin.php
@@ -204,16 +204,7 @@ abstract class AuthenticationPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureTable('user_username',
-                             array(new ColumnDef('provider_name', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('username', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
+        $schema->ensureDataObject('User_username');
         return true;
     }
 
diff --git a/plugins/Authentication/User_username.php b/plugins/Authentication/User_username.php
index f30f60d83..6826f2681 100644
--- a/plugins/Authentication/User_username.php
+++ b/plugins/Authentication/User_username.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_username
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
 
-class User_username extends Memcached_DataObject
+class User_username extends Plugin_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -43,4 +43,22 @@ class User_username extends Memcached_DataObject
             return false;
         }
     }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('provider_name', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('username', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
 }
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 55c0eadaf..6dd8a3f5a 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -156,6 +156,9 @@ class OpenIDPlugin extends Plugin
          case 'User_openid':
             require_once(INSTALLDIR.'/plugins/OpenID/User_openid.php');
             return false;
+         case 'User_openid_trustroot':
+            require_once(INSTALLDIR.'/plugins/OpenID/User_openid_trustroot.php');
+            return false;
          default:
             return true;
         }
@@ -278,24 +281,8 @@ class OpenIDPlugin extends Plugin
 
     function onCheckSchema() {
         $schema = Schema::get();
-        $schema->ensureTable('user_openid',
-                             array(new ColumnDef('canonical', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('display', 'varchar',
-                                                 '255', false),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false, 'MUL'),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
-        $schema->ensureTable('user_openid_trustroot',
-                             array(new ColumnDef('trustroot', 'varchar',
-                                                 '255', false, 'PRI'),
-                                   new ColumnDef('user_id', 'integer',
-                                                 null, false, 'PRI'),
-                                   new ColumnDef('created', 'datetime',
-                                                 null, false),
-                                   new ColumnDef('modified', 'timestamp')));
+        $schema->ensureDataObject('User_openid');
+        $schema->ensureDataObject('User_openid_trustroot');
         return true;
     }
 
diff --git a/plugins/OpenID/User_openid.php b/plugins/OpenID/User_openid.php
index 338e0f6e9..c3624118e 100644
--- a/plugins/OpenID/User_openid.php
+++ b/plugins/OpenID/User_openid.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_openid
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
 
-class User_openid extends Memcached_DataObject
+class User_openid extends Plugin_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -33,4 +33,22 @@ class User_openid extends Memcached_DataObject
 
         return ($cnt > 0);
     }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('canonical', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('display', 'varchar',
+                                                 '255', false),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'MUL'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
 }
diff --git a/plugins/OpenID/User_openid_trustroot.php b/plugins/OpenID/User_openid_trustroot.php
index 4654b72df..b208dddfd 100644
--- a/plugins/OpenID/User_openid_trustroot.php
+++ b/plugins/OpenID/User_openid_trustroot.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for user_openid_trustroot
  */
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
 
-class User_openid_trustroot extends Memcached_DataObject
+class User_openid_trustroot extends Plugin_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -26,4 +26,20 @@ class User_openid_trustroot extends Memcached_DataObject
     {
         return Memcached_DataObject::pkeyGet('User_openid_trustroot', $kv);
     }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('trustroot', 'varchar',
+                                                 '255', false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer',
+                                                 null, false, 'PRI'),
+                                   new ColumnDef('created', 'datetime',
+                                                 null, false),
+                                   new ColumnDef('modified', 'timestamp')));
+    }
 }
diff --git a/plugins/recaptcha/LICENSE b/plugins/Recaptcha/LICENSE
index b612f71f0..b612f71f0 100644
--- a/plugins/recaptcha/LICENSE
+++ b/plugins/Recaptcha/LICENSE
diff --git a/plugins/Recaptcha/README b/plugins/Recaptcha/README
new file mode 100644
index 000000000..49c4b9c27
--- /dev/null
+++ b/plugins/Recaptcha/README
@@ -0,0 +1,28 @@
+StatusNet reCAPTCHA plugin 0.3 11/16/09
+=======================================
+Adds a captcha to your registration page to reduce automated spam bots registering.
+
+Use:
+1. Get an API key from http://recaptcha.net
+
+2. In config.php add:
+addPlugin('recaptcha', array('private_key' => 'YourKeyHere',
+                              'public_key' => 'ReplaceWithYourKey'));
+or
+addPlugin('recaptcha', array('private_key' => 'YourKeyHere',
+                              'public_key' => 'ReplaceWithYourKey',
+                              'display_errors' => true));
+Changelog
+=========
+0.1 initial release
+0.2 Work around for webkit browsers
+0.3 Moved to new plugin arch for SN
+    **YOU WILL NEED TO CHANGE YOUR CONFIG.PHP!**
+
+reCAPTCHA Lib README
+====================
+
+The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation
+for this library can be found at
+
+	http://recaptcha.net/plugins/php
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/Recaptcha/RecaptchaPlugin.php
index 94cf0ccd1..1a51b16be 100644
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/Recaptcha/RecaptchaPlugin.php
@@ -33,7 +33,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 define('RECAPTCHA', '0.2');
 
-class recaptcha extends Plugin
+require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php');
+
+class RecaptchaPlugin extends Plugin
 {
     var $private_key;
     var $public_key;
@@ -41,13 +43,13 @@ class recaptcha extends Plugin
     var $failed;
     var $ssl;
 
-    function __construct($public_key, $private_key, $display_errors=false)
-    {
-        parent::__construct();
-        require_once(INSTALLDIR.'/plugins/recaptcha/recaptchalib.php');
-        $this->public_key = $public_key;
-        $this->private_key = $private_key; 
-        $this->display_errors = $display_errors;
+    function onInitializePlugin(){
+        if(!isset($this->private_key)){
+            common_log(LOG_ERR, "Recaptcha: Must specify private_key in config.php");
+        }
+        if(!isset($this->public_key)){
+            common_log(LOG_ERR, "Recaptcha: Must specify public_key in config.php");
+        }
     }
 
     function checkssl(){
diff --git a/plugins/recaptcha/recaptchalib.php b/plugins/Recaptcha/recaptchalib.php
index 897c50981..897c50981 100644
--- a/plugins/recaptcha/recaptchalib.php
+++ b/plugins/Recaptcha/recaptchalib.php
diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index fd0c51f95..4d8671c72 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -48,16 +48,7 @@ class UserFlagPlugin extends Plugin
         $schema = Schema::get();
 
         // For storing user-submitted flags on profiles
-
-        $schema->ensureTable('user_flag_profile',
-                             array(new ColumnDef('profile_id', 'integer', null,
-                                                 false, 'PRI'),
-                                   new ColumnDef('user_id', 'integer', null,
-                                                 false, 'PRI'),
-                                   new ColumnDef('created', 'datetime', null,
-                                                 false, 'MUL'),
-                                   new ColumnDef('cleared', 'datetime', null,
-                                                 true, 'MUL')));
+        $schema->ensureDataObject('User_flag_profile');
 
         return true;
     }
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index 30bd4ae68..2fb27912d 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -21,9 +21,9 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+require_once INSTALLDIR.'/classes/Plugin_DataObject.php';
 
-class User_flag_profile extends Memcached_DataObject
+class User_flag_profile extends Plugin_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -65,4 +65,21 @@ class User_flag_profile extends Memcached_DataObject
 
         return !empty($ufp);
     }
+
+    /**
+    * Get the TableDef object that represents the table backing this class
+    * @return TableDef TableDef instance
+    */
+    function tableDef()
+    {
+        return new TableDef($this->__table,
+                             array(new ColumnDef('profile_id', 'integer', null,
+                                                 false, 'PRI'),
+                                   new ColumnDef('user_id', 'integer', null,
+                                                 false, 'PRI'),
+                                   new ColumnDef('created', 'datetime', null,
+                                                 false, 'MUL'),
+                                   new ColumnDef('cleared', 'datetime', null,
+                                                 true, 'MUL')));
+    }
 }
diff --git a/plugins/recaptcha/README b/plugins/recaptcha/README
deleted file mode 100644
index b996f96cc..000000000
--- a/plugins/recaptcha/README
+++ /dev/null
@@ -1,23 +0,0 @@
-StatusNet reCAPTCHA plugin 0.2 8/3/09
-====================================
-Adds a captcha to your registration page to reduce automated spam bots registering.
-
-Use:
-1. Get an API key from http://recaptcha.net
-
-2. In config.php add:
-include_once('plugins/recaptcha/recaptcha.php');
-$captcha = new recaptcha(publickey, privatekey, showErrors);
-
-Changelog
-=========
-0.1 initial release
-0.2 Work around for webkit browsers
-
-reCAPTCHA README
-================
-
-The reCAPTCHA PHP Lirary helps you use the reCAPTCHA API. Documentation
-for this library can be found at
-
-	http://recaptcha.net/plugins/php
diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c..52389123c 100644..100755
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1be66fe5a..a6a93c405 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -93,14 +93,17 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }