From cb49ea88d33d51ce5a7bec3c90bbea7e0cb33890 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 1 Mar 2011 19:35:20 -0800
Subject: [PATCH 01/17] Initial go at a site directory plugin

---
 plugins/Directory/DirectoryPlugin.php       | 159 +++++++++++++
 plugins/Directory/actions/userdirectory.php | 241 ++++++++++++++++++++
 plugins/Directory/lib/alphanav.php          | 107 +++++++++
 3 files changed, 507 insertions(+)
 create mode 100644 plugins/Directory/DirectoryPlugin.php
 create mode 100644 plugins/Directory/actions/userdirectory.php
 create mode 100644 plugins/Directory/lib/alphanav.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
new file mode 100644
index 0000000000..0ff2ea76bf
--- /dev/null
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Adds a user directory
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copely <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Directory plugin main class
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class DirectoryPlugin extends Plugin
+{
+    /**
+     * Initializer for this plugin
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function initialize()
+    {
+        return true;
+    }
+
+    /**
+     * Cleanup for this plugin.
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function cleanup()
+    {
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        // common_debug("class = $cls");
+
+        switch ($cls)
+        {
+        case 'UserdirectoryAction':
+            include_once $dir
+                . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'AlphaNav':
+            include_once $dir
+                . '/lib/' . strtolower($cls) . '.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect(
+            'main/directory',
+            array('action' => 'userdirectory')
+        );
+
+        return true;
+    }
+
+    /**
+     * Modify the public local nav to add a link to the user directory
+     *
+     * @param Action $action The current action handler. Use this to
+     *                       do any output.
+     *
+     * @return boolean hook value; true means continue processing,
+     *         false means stop.
+     *
+     * @see Action
+     */
+    function onEndPublicGroupNav($nav)
+    {
+        // XXX: Maybe this should go under search instead?
+
+        $actionName = $nav->action->trimmed('action');
+
+        $nav->out->menuItem(
+            common_local_url('userdirectory'),
+            _('Directory'),
+            _('User Directory'),
+            $actionName == 'userdirectory',
+            'nav_directory'
+        );
+
+        return true;
+    }
+
+    /*
+     * Version info
+     */
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array(
+            'name' => 'Directory',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Zach Copley',
+            'homepage' => 'http://status.net/wiki/Plugin:Directory',
+            'rawdescription' => _m('Add a user directory.')
+        );
+
+        return true;
+    }
+}
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
new file mode 100644
index 0000000000..e4c8f673ed
--- /dev/null
+++ b/plugins/Directory/actions/userdirectory.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Output a user directory
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Public
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET'))
+{
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/publicgroupnav.php';
+
+/**
+ * User directory
+ *
+ * @category Personal
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+class UserdirectoryAction extends Action
+{
+    /* Page we're on */
+    protected $page   = null;
+
+    /* What to filter the search results by */
+    protected $filter = null;
+
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+    function title()
+    {
+        // @fixme: This looks kinda gross
+
+        if ($this->filter == 'All') {
+            if ($this->page != 1) {
+                return(sprintf(_m('All users, page %d'), $this->page));
+            }
+            return _m('All users');
+        }
+
+        if ($this->page == 1) {
+            return sprintf(
+                _m('Users with nicknames beginning with %s'),
+                $this->filter
+            );
+        } else {
+            return sprintf(
+                _m('Users with nicknames starting with %s, page %d'),
+                $this->filter,
+                $this->page
+            );
+        }
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+    function getInstructions()
+    {
+        return _('User directory');
+    }
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+    function isReadOnly($args)
+    {
+        return true;
+    }
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     * @todo move queries from showContent() to here
+     */
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
+        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'All';
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows the page
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Local navigation
+     *
+     * This page is part of the public group, so show that.
+     *
+     * @return void
+     */
+    function showLocalNav()
+    {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
+    }
+
+    /**
+     * Content area
+     *
+     * Shows the list of popular notices
+     *
+     * @return void
+     */
+    function showContent()
+    {
+        // XXX Need search bar
+
+        $alphaNav = new AlphaNav($this, true, array('All'));
+        $alphaNav->show();
+
+        // XXX Maybe use a more specialized version of ProfileList here
+
+        $profile = $this->getUsers();
+        $cnt     = 0;
+
+        if (!empty($profile)) {
+            $profileList = new SubscriptionList(
+                $profile,
+                common_current_user(),
+                $this
+            );
+
+            $cnt = $profileList->show();
+
+            if (0 == $cnt) {
+                $this->showEmptyListMessage();
+            }
+        }
+
+        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                          $this->page, 'userdirectory',
+                          array('filter' => $this->filter));
+
+    }
+
+    /*
+     * Get users filtered by the current filter and page
+     */
+    function getUsers()
+    {
+        $offset = ($this->page-1) * PROFILES_PER_PAGE;
+        $limit =  PROFILES_PER_PAGE + 1;
+
+        $profile = new Profile();
+
+        if ($this->filter != 'All') {
+            $profile->whereAdd(
+                sprintf('LEFT(UPPER(nickname), 1) = \'%s\'', $this->filter)
+            );
+        }
+        $profile->orderBy('created DESC, nickname');
+        $profile->find();
+
+        return $profile;
+    }
+
+    /**
+     * Show a nice message when there's no search results
+     */
+    function showEmptyListMessage()
+    {
+        $message = sprintf(_m('No users starting with %s'), $this->filter);
+
+        $this->elementStart('div', 'guide');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
+
+}
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
new file mode 100644
index 0000000000..228237bfed
--- /dev/null
+++ b/plugins/Directory/lib/alphanav.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Widget to display an alphabet menu
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Widget
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Outputs a fancy alphabet letter navigation menu
+ *
+ * @category Widget
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+
+class AlphaNav extends Widget
+{
+    protected $action  = null;
+    protected $filters = array();
+
+    /**
+     * Prepare the widget for use
+     *
+     * @param Action  $action  the current action
+     * @param boolean $numbers whether to output 0..9
+     * @param Array   $prepend array of filters to prepend
+     * @param Array   $append  array of filters to append
+     */
+    function __construct(
+            $action  = null,
+            $numbers = false,
+            $prepend = false,
+            $append  = false
+    )
+    {
+        parent::__construct($action);
+
+        $this->action  = $action;
+
+        if ($prepend) {
+            $this->filters = array_merge($prepend, $this->filters);
+        }
+
+        if ($numbers) {
+            $this->filters = array_merge($this->filters, range(0, 9));
+        }
+
+        if ($append) {
+            $this->filters = array_merge($this->filters, $append);
+        }
+
+        $this->filters = array_merge($this->filters, range('A', 'Z'));
+    }
+
+    /**
+     * Show the widget
+     *
+     * Emit the HTML for the widget, using the configured outputter.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $actionName = $this->action->trimmed('action');
+
+        foreach ($this->filters as $filter) {
+            $href = common_local_url(
+                $actionName,
+                null,
+                array('filter' => $filter)
+            );
+            $this->action->element('a', array('href' => $href), $filter);
+        }
+    }
+
+}

From 3b186e1bae91ae0030c8eeb58fdfbc114dfd0b84 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 2 Mar 2011 20:21:15 -0800
Subject: [PATCH 02/17] * Fix pagination * Add some more elements for styling *
 Add initial CSS

---
 plugins/Directory/DirectoryPlugin.php       | 40 +++++++++++++++++----
 plugins/Directory/actions/userdirectory.php | 39 ++++++++++++++------
 plugins/Directory/css/directory.css         | 34 ++++++++++++++++++
 plugins/Directory/lib/alphanav.php          | 37 ++++++++++++++++---
 4 files changed, 129 insertions(+), 21 deletions(-)
 create mode 100644 plugins/Directory/css/directory.css

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 0ff2ea76bf..aaa33a1ec1 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -44,6 +44,9 @@ if (!defined('STATUSNET')) {
  */
 class DirectoryPlugin extends Plugin
 {
+
+    private $dir = null;
+
     /**
      * Initializer for this plugin
      *
@@ -52,6 +55,7 @@ class DirectoryPlugin extends Plugin
      */
     function initialize()
     {
+        $this->dir = dirname(__FILE__);
         return true;
     }
 
@@ -76,18 +80,16 @@ class DirectoryPlugin extends Plugin
      */
     function onAutoload($cls)
     {
-        $dir = dirname(__FILE__);
-
         // common_debug("class = $cls");
 
         switch ($cls)
         {
         case 'UserdirectoryAction':
-            include_once $dir
+            include_once $this->dir
                 . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'AlphaNav':
-            include_once $dir
+            include_once $this->dir
                 . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
@@ -106,10 +108,36 @@ class DirectoryPlugin extends Plugin
     function onRouterInitialized($m)
     {
         $m->connect(
-            'main/directory',
-            array('action' => 'userdirectory')
+            'directory/users/:filter',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z_]{1,64}')
         );
 
+        $m->connect(
+            'directory/users',
+            array('action' => 'userdirectory'),
+            array('filter' => 'all')
+        );
+
+        return true;
+    }
+
+    /**
+     * Link in a styelsheet for the onboarding actions
+     *
+     * @param Action $action Action being shown
+     *
+     * @return boolean hook flag
+     */
+    function onEndShowStatusNetStyles($action)
+    {
+        if (in_array(
+            $action->trimmed('action'),
+            array('userdirectory'))
+        ) {
+            $action->cssLink($this->path('css/directory.css'));
+        }
+
         return true;
     }
 
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index e4c8f673ed..7e9f20c369 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -45,10 +45,14 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
  */
 class UserdirectoryAction extends Action
 {
-    /* Page we're on */
+    /**
+     * @var $page       integer  the page we're on
+     */
     protected $page   = null;
 
-    /* What to filter the search results by */
+    /**
+     * @var $filter     string    what to filter the search results by
+     */
     protected $filter = null;
 
     /**
@@ -60,7 +64,7 @@ class UserdirectoryAction extends Action
     {
         // @fixme: This looks kinda gross
 
-        if ($this->filter == 'All') {
+        if ($this->filter == 'all') {
             if ($this->page != 1) {
                 return(sprintf(_m('All users, page %d'), $this->page));
             }
@@ -115,7 +119,7 @@ class UserdirectoryAction extends Action
         parent::prepare($args);
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'All';
+        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
         common_set_returnto($this->selfUrl());
 
         return true;
@@ -177,6 +181,8 @@ class UserdirectoryAction extends Action
     {
         // XXX Need search bar
 
+        $this->elementStart('div', array('id' => 'user_directory'));
+
         $alphaNav = new AlphaNav($this, true, array('All'));
         $alphaNav->show();
 
@@ -199,9 +205,15 @@ class UserdirectoryAction extends Action
             }
         }
 
-        $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
-                          $this->page, 'userdirectory',
-                          array('filter' => $this->filter));
+        $this->pagination(
+            $this->page > 1,
+            $cnt > PROFILES_PER_PAGE,
+            $this->page,
+            'userdirectory',
+            array('filter' => $this->filter)
+        );
+
+        $this->elementEnd('div');
 
     }
 
@@ -210,17 +222,22 @@ class UserdirectoryAction extends Action
      */
     function getUsers()
     {
-        $offset = ($this->page-1) * PROFILES_PER_PAGE;
-        $limit =  PROFILES_PER_PAGE + 1;
+        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
+        $limit  =  PROFILES_PER_PAGE + 1;
 
         $profile = new Profile();
 
-        if ($this->filter != 'All') {
+        // XXX Any chance of SQL injection here?
+
+        if ($this->filter != 'all') {
             $profile->whereAdd(
-                sprintf('LEFT(UPPER(nickname), 1) = \'%s\'', $this->filter)
+                sprintf('LEFT(lower(nickname), 1) = \'%s\'', $this->filter)
             );
         }
+
         $profile->orderBy('created DESC, nickname');
+        $profile->limit($limit, $offset);
+
         $profile->find();
 
         return $profile;
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
new file mode 100644
index 0000000000..3778525a84
--- /dev/null
+++ b/plugins/Directory/css/directory.css
@@ -0,0 +1,34 @@
+/* CSS file for the Directory plugin */
+
+div#user_directory div.alpha_nav {
+    overflow: hidden;
+    width: 100%;
+    text-align: center;
+}
+
+/* XXX: this needs serious CSS foo */
+div#user_directory div.alpha_nav > a {
+    border-left: 1px solid #000;
+    padding-left: 2px;
+}
+div#user_directory div.alpha_nav > a.first {
+    border-left: none;
+}
+
+div#user_directory div.alpha_nav a:link {
+    text-decoration: none;
+}
+
+div#user_directory div.alpha_nav a:visited {
+    text-decoration: none;
+}
+div#user_directory div.alpha_nav a:active {
+    text-decoration: none;
+}
+div#user_directory div.alpha_nav a:hover {
+    text-decoration: underline; color: blue;
+}
+
+div#user_directory div.alpha_nav a.current {
+    background-color:#9BB43E;
+}
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 228237bfed..6829f3d2c3 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -94,14 +94,43 @@ class AlphaNav extends Widget
     {
         $actionName = $this->action->trimmed('action');
 
-        foreach ($this->filters as $filter) {
+        $this->action->elementStart('div', array('class' => 'alpha_nav'));
+
+        for ($i = 0, $size = sizeof($this->filters); $i < $size; $i++) {
+
+            $filter = $this->filters[$i];
+            $classes = '';
+
+            // Add some classes for styling
+            if ($i == 0) {
+                $classes .= 'first '; // first filter in the list
+            } elseif ($i == $size - 1) {
+                $classes .= 'last ';  // last filter in the list
+            }
+
             $href = common_local_url(
                 $actionName,
-                null,
-                array('filter' => $filter)
+                array('filter' => strtolower($filter))
             );
-            $this->action->element('a', array('href' => $href), $filter);
+
+            $params  = array('href' => $href);
+            $current = $this->action->arg('filter');
+
+            // Highlight the selected filter. If there is no selected
+            // filter, highlight the first filter in the list
+            if (empty($current) && $i == 0
+                || $current === strtolower($filter)) {
+                $classes .= 'current ';
+            }
+
+            if (!empty($classes)) {
+                $params['class'] = trim($classes);
+            }
+
+            $this->action->element('a', $params, $filter);
         }
+
+        $this->action->elementEnd('div');
     }
 
 }

From f157c523fd906f4b007d6f1b465b73832e291473 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Thu, 3 Mar 2011 21:12:24 -0800
Subject: [PATCH 03/17] * Reformat list of profiles in a table * Make table
 sortable

---
 plugins/Directory/DirectoryPlugin.php         |  11 +-
 plugins/Directory/actions/userdirectory.php   |  29 +-
 plugins/Directory/css/directory.css           |  30 +++
 .../Directory/images/control_arrow_down.gif   | Bin 0 -> 110 bytes
 plugins/Directory/images/control_arrow_up.gif | Bin 0 -> 111 bytes
 plugins/Directory/lib/alphanav.php            |  15 +-
 .../lib/sortablesubscriptionlist.php          | 248 ++++++++++++++++++
 7 files changed, 326 insertions(+), 7 deletions(-)
 create mode 100644 plugins/Directory/images/control_arrow_down.gif
 create mode 100644 plugins/Directory/images/control_arrow_up.gif
 create mode 100644 plugins/Directory/lib/sortablesubscriptionlist.php

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index aaa33a1ec1..8fd7785ec9 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -55,7 +55,6 @@ class DirectoryPlugin extends Plugin
      */
     function initialize()
     {
-        $this->dir = dirname(__FILE__);
         return true;
     }
 
@@ -82,14 +81,20 @@ class DirectoryPlugin extends Plugin
     {
         // common_debug("class = $cls");
 
+        $dir = dirname(__FILE__);
+
         switch ($cls)
         {
         case 'UserdirectoryAction':
-            include_once $this->dir
+            include_once $dir
                 . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'AlphaNav':
-            include_once $this->dir
+            include_once $dir
+                . '/lib/' . strtolower($cls) . '.php';
+            return false;
+        case 'SortableSubscriptionList':
+            include_once $dir
                 . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 7e9f20c369..7b8dbbdf60 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -120,6 +120,9 @@ class UserdirectoryAction extends Action
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
         $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
+        $this->sort   = $this->arg('sort');
+        $this->order  = $this->boolean('asc'); // ascending or decending
+
         common_set_returnto($this->selfUrl());
 
         return true;
@@ -192,7 +195,7 @@ class UserdirectoryAction extends Action
         $cnt     = 0;
 
         if (!empty($profile)) {
-            $profileList = new SubscriptionList(
+            $profileList = new SortableSubscriptionList(
                 $profile,
                 common_current_user(),
                 $this
@@ -235,7 +238,10 @@ class UserdirectoryAction extends Action
             );
         }
 
-        $profile->orderBy('created DESC, nickname');
+        $sort  = $this->getSortKey();
+        $order = ($this->order) ? 'ASC' : 'DESC';
+
+        $profile->orderBy("$sort $order, nickname");
         $profile->limit($limit, $offset);
 
         $profile->find();
@@ -243,6 +249,25 @@ class UserdirectoryAction extends Action
         return $profile;
     }
 
+    /**
+     * Filter the sort parameter
+     *
+     * @return string   a column name for sorting
+     */
+    function getSortKey()
+    {
+        switch ($this->sort) {
+        case 'nickname':
+            return $this->sort;
+            break;
+        case 'created':
+            return $this->sort;
+            break;
+        default:
+            return 'nickname';
+        }
+    }
+
     /**
      * Show a nice message when there's no search results
      */
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
index 3778525a84..76c9fc2583 100644
--- a/plugins/Directory/css/directory.css
+++ b/plugins/Directory/css/directory.css
@@ -32,3 +32,33 @@ div#user_directory div.alpha_nav a:hover {
 div#user_directory div.alpha_nav a.current {
     background-color:#9BB43E;
 }
+
+table.profile_list {
+    width: 100%;
+}
+
+table.profile_list tr {
+    float: none;
+}
+
+table.profile_list tr.alt {
+    background-color: #def; /* zebra stripe */
+}
+
+table.profie_list td {
+    width: 100%;
+    padding: 0;
+}
+
+
+th.current {
+    background-image: url(../images/control_arrow_down.gif);
+    background-repeat: no-repeat;
+    background-position: 60% 2px;
+}
+
+th.current.asc {
+    background-image: url(../images/control_arrow_up.gif);
+    background-repeat: no-repeat;
+    background-position: 60% 2px;
+}
\ No newline at end of file
diff --git a/plugins/Directory/images/control_arrow_down.gif b/plugins/Directory/images/control_arrow_down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..de28df6eb09f57780f20337be3df81ebfc714511
GIT binary patch
literal 110
zcmZ?wbhEHb<YeGv*vtR||NsAg`}XbCt5+{wx^(#P;h8gMhJ=L3$;okYaxybB17*Rg
zpoHR27DfgJZU!9?A7lmti*&(B&(&L%8~0w0VB0Qv`Jn8S28NCRQLjS55Ece&05w4(
AjsO4v

literal 0
HcmV?d00001

diff --git a/plugins/Directory/images/control_arrow_up.gif b/plugins/Directory/images/control_arrow_up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..898aa604bb50b656c88a6b3ddad724d962cec6a6
GIT binary patch
literal 111
zcmZ?wbhEHb<YeGv*vtR||NsAg`}XbCt5+{wx^(#P;h8gMhJ=L3$;okYaxybB17*Rg
zpoHR27DfgJZU!9?A7lmti%h{u&(*O{#6nj&FenAEC&*1sTzAY!W%W#+=^~5_)&M)G
BA?W}B

literal 0
HcmV?d00001

diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 6829f3d2c3..33380b0b2b 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -27,7 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -114,11 +114,22 @@ class AlphaNav extends Widget
             );
 
             $params  = array('href' => $href);
+
+            // sort column
+            if (!empty($this->action->sort)) {
+                $params['sort'] = $this->action->sort;
+            }
+
+            // sort order
+            if (!empty($this->action->order)) {
+                $params['asc'] = 'true';
+            }
+
             $current = $this->action->arg('filter');
 
             // Highlight the selected filter. If there is no selected
             // filter, highlight the first filter in the list
-            if (empty($current) && $i == 0
+            if (!isset($current) && $i == 0
                 || $current === strtolower($filter)) {
                 $classes .= 'current ';
             }
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
new file mode 100644
index 0000000000..2a412a628d
--- /dev/null
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Widget to show a sortable list of profiles
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Public
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/subscriptionlist.php';
+
+/**
+ * Widget to show a sortable list of subscriptions
+ *
+ * @category Public
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ */
+
+class SortableSubscriptionList extends SubscriptionList
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner=null, $action=null)
+    {
+        parent::__construct($profile, $owner, $action);
+
+        $this->owner = $owner;
+    }
+
+    function startList()
+    {
+        $this->out->elementStart('table', array('class' => 'profile_list xoxo'));
+        $this->out->elementStart('thead');
+        $this->out->elementStart('tr');
+
+        $tableHeaders = array(
+            'nickname'    => _m('Nickname'),
+            'created'     => _m('Created')
+        );
+
+        foreach ($tableHeaders as $id => $label) {
+            $attrs = array('id' => $id);
+
+            $current = (!empty($this->action->sort) && $this->action->sort == $id);
+
+            if ($current || empty($this->action->sort) && $id == 'nickname') {
+                $attrs['class'] = 'current';
+            }
+
+            if ($current && !$this->action->boolean('asc')) {
+                $attrs['class'] .= ' asc';
+                $attrs['class'] = trim($attrs['class']);
+            }
+
+            $this->out->elementStart('th', $attrs);
+
+            $linkAttrs = array();
+            $params    = array('sort' => $id);
+
+            if ($current && !$this->action->boolean('asc')) {
+                $params['asc'] = "true";
+            }
+
+            $args = array();
+
+            $filter = $this->action->arg('filter');
+
+            if (!empty($filter)) {
+                $args['filter'] = $filter;
+            }
+
+            $linkAttrs['href'] = common_local_url(
+                $this->action->arg('action'), $args, $params
+            );
+
+            $this->out->element('a', $linkAttrs, $label);
+            $this->out->elementEnd('th');
+        }
+
+        $this->out->element('th', array('id' => 'subscriptions'), 'Subscriptions');
+        $this->out->element('th', array('id' => 'notices'), 'Notices');
+        //$this->out->element('th', array('id' => 'controls'), 'Controls');
+
+        $this->out->elementEnd('tr');
+        $this->out->elementEnd('thead');
+
+        $this->out->elementStart('tbody');
+    }
+
+    function endList()
+    {
+        $this->out->elementEnd('tbody');
+        $this->out->elementEnd('table');
+    }
+
+    function showProfiles()
+    {
+        $cnt = 0;
+
+        while ($this->profile->fetch()) {
+            $cnt++;
+            if($cnt > PROFILES_PER_PAGE) {
+                break;
+            }
+
+            $odd = ($cnt % 2 == 0); // for zebra striping
+
+            $pli = $this->newListItem($this->profile, $odd);
+            $pli->show();
+        }
+
+        return $cnt;
+    }
+
+    function newListItem($profile, $odd)
+    {
+        return new SortableSubscriptionListItem($profile, $this->owner, $this->action, $odd);
+    }
+}
+
+class SortableSubscriptionListItem extends SubscriptionListItem
+{
+    /** Owner of this list */
+    var $owner = null;
+
+    function __construct($profile, $owner, $action, $alt)
+    {
+        parent::__construct($profile, $owner, $action);
+
+        $this->alt   = $alt; // is this row alternate?
+        $this->owner = $owner;
+    }
+
+    function startItem()
+    {
+        $attr = array(
+            'class' => 'profile',
+            'id'    => 'profile-' . $this->profile->id
+        );
+
+        if ($this->alt) {
+            $attr['class'] .= ' alt';
+        }
+
+        $this->out->elementStart('tr', $attr);
+    }
+
+    function endItem()
+    {
+        $this->out->elementEnd('tr');
+    }
+
+    function startProfile()
+    {
+        $this->out->elementStart('td', 'entity_profile vcard entry-content');
+    }
+
+    function endProfile()
+    {
+        $this->out->elementEnd('td');
+    }
+
+    function startActions()
+    {
+        $this->out->elementStart('td', 'entity_actions');
+        $this->out->elementStart('ul');
+    }
+
+    function endActions()
+    {
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('td');
+    }
+
+    function show()
+    {
+        if (Event::handle('StartProfileListItem', array($this))) {
+            $this->startItem();
+            if (Event::handle('StartProfileListItemProfile', array($this))) {
+                $this->showProfile();
+                Event::handle('EndProfileListItemProfile', array($this));
+            }
+
+            // XXX Add events?
+            $this->showCreatedDate();
+            $this->showSubscriberCount();
+            $this->showNoticeCount();
+
+            if (Event::handle('StartProfileListItemActions', array($this))) {
+                $this->showActions();
+                Event::handle('EndProfileListItemActions', array($this));
+            }
+            $this->endItem();
+            Event::handle('EndProfileListItem', array($this));
+        }
+    }
+
+    function showSubscriberCount()
+    {
+        $this->out->elementStart('td', 'entry_subscriber_count');
+        $this->out->raw($this->profile->subscriberCount());
+        $this->out->elementEnd('td');
+    }
+
+    function showCreatedDate()
+    {
+        $this->out->elementStart('td', 'entry_created');
+        $this->out->raw(date('j M Y', strtotime($this->profile->created)));
+        $this->out->elementEnd('td');
+    }
+
+    function showNoticeCount()
+    {
+        $this->out->elementStart('td', 'entry_notice_count');
+        $this->out->raw($this->profile->noticeCount());
+        $this->out->elementEnd('td');
+    }
+
+}

From 52df926b8d7d1c284bc4f6dcf6ce4d8a74730087 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 4 Mar 2011 17:25:58 -0800
Subject: [PATCH 04/17] Only show profiles of local users

---
 plugins/Directory/actions/userdirectory.php   | 29 +++++++++++--------
 .../lib/sortablesubscriptionlist.php          | 11 +++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 7b8dbbdf60..60ab43693b 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -119,7 +119,8 @@ class UserdirectoryAction extends Action
         parent::prepare($args);
 
         $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $this->filter = $this->arg('filter') ? $this->arg('filter') : 'all';
+        $filter       = $this->arg('filter');
+        $this->filter = isset($filter) ? $filter : 'all';
         $this->sort   = $this->arg('sort');
         $this->order  = $this->boolean('asc'); // ascending or decending
 
@@ -225,26 +226,30 @@ class UserdirectoryAction extends Action
      */
     function getUsers()
     {
-        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
-        $limit  =  PROFILES_PER_PAGE + 1;
 
         $profile = new Profile();
 
-        // XXX Any chance of SQL injection here?
+        $offset = ($this->page - 1) * PROFILES_PER_PAGE;
+        $limit  = PROFILES_PER_PAGE + 1;
+        $sort   = $this->getSortKey();
+        $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
         if ($this->filter != 'all') {
-            $profile->whereAdd(
-                sprintf('LEFT(lower(nickname), 1) = \'%s\'', $this->filter)
+            $sql .= sprintf(
+                ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
+                $this->filter
             );
         }
 
-        $sort  = $this->getSortKey();
-        $order = ($this->order) ? 'ASC' : 'DESC';
+        $sql .= sprintf(
+            ' ORDER BY profile.%s %s, profile.nickname DESC LIMIT %d, %d',
+            $sort,
+            ($this->order) ? 'ASC' : 'DESC',
+            $offset,
+            $limit
+        );
 
-        $profile->orderBy("$sort $order, nickname");
-        $profile->limit($limit, $offset);
-
-        $profile->find();
+        $profile->query($sql);
 
         return $profile;
     }
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index 2a412a628d..a22aeadb3d 100644
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -245,4 +245,15 @@ class SortableSubscriptionListItem extends SubscriptionListItem
         $this->out->elementEnd('td');
     }
 
+    /**
+     * Only show the tags if we're logged in
+     */
+    function showTags()
+    {
+         if (common_logged_in()) {
+            parent::showTags();
+        }
+
+    }
+
 }

From 7d76b55da18df126372780e74f7943dd2e9b2323 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 4 Mar 2011 17:55:56 -0800
Subject: [PATCH 05/17] fixup comments

---
 plugins/Directory/actions/userdirectory.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 60ab43693b..f6ff0b3eec 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -46,12 +46,16 @@ require_once INSTALLDIR . '/lib/publicgroupnav.php';
 class UserdirectoryAction extends Action
 {
     /**
-     * @var $page       integer  the page we're on
+     * The page we're on
+     *
+     * @var integer
      */
     protected $page   = null;
 
     /**
-     * @var $filter     string    what to filter the search results by
+     * what to filter the search results by
+     *
+     * @var string
      */
     protected $filter = null;
 
@@ -111,8 +115,6 @@ class UserdirectoryAction extends Action
      * @param array $args $_REQUEST args
      *
      * @return boolean success flag
-     *
-     * @todo move queries from showContent() to here
      */
     function prepare($args)
     {
@@ -222,7 +224,8 @@ class UserdirectoryAction extends Action
     }
 
     /*
-     * Get users filtered by the current filter and page
+     * Get users filtered by the current filter, sort key,
+     * sort order, and page
      */
     function getUsers()
     {
@@ -278,7 +281,7 @@ class UserdirectoryAction extends Action
      */
     function showEmptyListMessage()
     {
-        $message = sprintf(_m('No users starting with %s'), $this->filter);
+        $message = sprintf(_m('No users starting with **%s**'), $this->filter);
 
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));

From 5f1a795b735e6054c7e9e7f2b32850c74ec95552 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 5 Mar 2011 01:54:47 -0800
Subject: [PATCH 06/17] Add some other ways to order searches to the base
 search engine class

---
 lib/search_engines.php | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/search_engines.php b/lib/search_engines.php
index 19703e03fd..7f1684a3e7 100644
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -41,8 +41,35 @@ class SearchEngine
 
     function set_sort_mode($mode)
     {
-        if ('chron' === $mode)
-            return $this->target->orderBy('created desc');
+        switch ($mode) {
+        case 'chron':
+            return $this->target->orderBy('created DESC');
+            break;
+        case 'reverse_chron':
+            return $this->target->orderBy('created ASC');
+            break;
+        case 'nickname_desc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                return $this->target->orderBy('nickname DESC');
+            }
+            break;
+        case 'nickname_asc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                return $this->target->orderBy('nickname ASC');
+            }
+            break;
+        default:
+            return $this->target->orderBy('created DESC');
+            break;
+        }
     }
 }
 

From 5d22f969a1ca27d2a81c27596978e7e0479310fb Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 5 Mar 2011 01:55:52 -0800
Subject: [PATCH 07/17] * Integrate search input box * Fix ordering

---
 plugins/Directory/DirectoryPlugin.php         |  12 +-
 plugins/Directory/actions/userdirectory.php   | 137 ++++++++++++++----
 plugins/Directory/css/directory.css           |   2 +-
 plugins/Directory/lib/alphanav.php            |   4 +-
 .../lib/sortablesubscriptionlist.php          |  16 +-
 5 files changed, 128 insertions(+), 43 deletions(-)

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 8fd7785ec9..50a0da7cf9 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -112,18 +112,18 @@ class DirectoryPlugin extends Plugin
      */
     function onRouterInitialized($m)
     {
-        $m->connect(
-            'directory/users/:filter',
-            array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z_]{1,64}')
-        );
-
         $m->connect(
             'directory/users',
             array('action' => 'userdirectory'),
             array('filter' => 'all')
         );
 
+        $m->connect(
+            'directory/users/:filter',
+            array('action' => 'userdirectory'),
+            array('filter' => '[0-9a-zA-Z_]{1,64}')
+        );
+
         return true;
     }
 
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index f6ff0b3eec..005fb787d3 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -50,14 +50,35 @@ class UserdirectoryAction extends Action
      *
      * @var integer
      */
-    protected $page   = null;
+    public $page;
 
     /**
-     * what to filter the search results by
+     * What to filter the search results by
      *
      * @var string
      */
-    protected $filter = null;
+    public $filter;
+
+    /**
+     * Column to sort by
+     *
+     * @var string
+     */
+    public $sort;
+
+    /**
+     * How to order search results, ascending or descending
+     *
+     * @var string
+     */
+    public $reverse;
+
+    /**
+     * Query
+     *
+     * @var string
+     */
+    public $q;
 
     /**
      * Title of the page
@@ -120,11 +141,11 @@ class UserdirectoryAction extends Action
     {
         parent::prepare($args);
 
-        $this->page   = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
-        $filter       = $this->arg('filter');
-        $this->filter = isset($filter) ? $filter : 'all';
-        $this->sort   = $this->arg('sort');
-        $this->order  = $this->boolean('asc'); // ascending or decending
+        $this->page    = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
+        $this->filter  = $this->arg('filter', 'all');
+        $this->reverse = $this->boolean('reverse');
+        $this->q       = $this->trimmed('q');
+        $this->sort    = $this->arg('sort', 'nickname');
 
         common_set_returnto($this->selfUrl());
 
@@ -185,15 +206,14 @@ class UserdirectoryAction extends Action
      */
     function showContent()
     {
-        // XXX Need search bar
+        $this->showForm();
 
         $this->elementStart('div', array('id' => 'user_directory'));
 
         $alphaNav = new AlphaNav($this, true, array('All'));
         $alphaNav->show();
 
-        // XXX Maybe use a more specialized version of ProfileList here
-
+        $profile = null;
         $profile = $this->getUsers();
         $cnt     = 0;
 
@@ -205,55 +225,116 @@ class UserdirectoryAction extends Action
             );
 
             $cnt = $profileList->show();
+            $profile->free();
 
             if (0 == $cnt) {
                 $this->showEmptyListMessage();
             }
         }
 
+        $args = array();
+        if (isset($this->q)) {
+            $args['q'] = $this->q;
+        } else {
+            $args['filter'] = $this->filter;
+        }
+
         $this->pagination(
             $this->page > 1,
             $cnt > PROFILES_PER_PAGE,
             $this->page,
             'userdirectory',
-            array('filter' => $this->filter)
+            $args
         );
 
         $this->elementEnd('div');
 
     }
 
+    function showForm($error=null)
+    {
+        $this->elementStart(
+            'form',
+            array(
+                'method' => 'get',
+                'id'     => 'form_search',
+                'class'  => 'form_settings',
+                'action' => common_local_url('userdirectory')
+            )
+        );
+
+        $this->elementStart('fieldset');
+
+        $this->element('legend', null, _('Search site'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+
+        $this->input('q', _('Keyword(s)'), $this->q);
+
+        $this->submit('search', _m('BUTTON','Search'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
     /*
      * Get users filtered by the current filter, sort key,
      * sort order, and page
      */
     function getUsers()
     {
-
         $profile = new Profile();
 
         $offset = ($this->page - 1) * PROFILES_PER_PAGE;
         $limit  = PROFILES_PER_PAGE + 1;
-        $sort   = $this->getSortKey();
-        $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
-        if ($this->filter != 'all') {
+        if (isset($this->q)) {
+             // User is searching via query
+             $search_engine = $profile->getSearchEngine('profile');
+
+             $mode = 'reverse_chron';
+
+             if ($this->sort == 'nickname') {
+                 if ($this->reverse) {
+                     $mode = 'nickname_desc';
+                 } else {
+                     $mode = 'nickname_asc';
+                 }
+             } else {
+                 if ($this->reverse) {
+                     $mode = 'chron';
+                 }
+             }
+
+             $search_engine->set_sort_mode($mode);
+             $search_engine->limit($offset, $limit);
+             $search_engine->query($this->q);
+
+             $profile->find();
+        } else {
+            // User is browsing via AlphaNav
+            $sort   = $this->getSortKey();
+            $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
+
+            if ($this->filter != 'all') {
+                $sql .= sprintf(
+                    ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
+                    $this->filter
+                );
+            }
+
             $sql .= sprintf(
-                ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
-                $this->filter
+                ' ORDER BY profile.%s %s, profile.nickname ASC LIMIT %d, %d',
+                $sort,
+                $this->reverse ? 'DESC' : 'ASC',
+                $offset,
+                $limit
             );
+
+            $profile->query($sql);
         }
 
-        $sql .= sprintf(
-            ' ORDER BY profile.%s %s, profile.nickname DESC LIMIT %d, %d',
-            $sort,
-            ($this->order) ? 'ASC' : 'DESC',
-            $offset,
-            $limit
-        );
-
-        $profile->query($sql);
-
         return $profile;
     }
 
diff --git a/plugins/Directory/css/directory.css b/plugins/Directory/css/directory.css
index 76c9fc2583..14fd2ce23b 100644
--- a/plugins/Directory/css/directory.css
+++ b/plugins/Directory/css/directory.css
@@ -57,7 +57,7 @@ th.current {
     background-position: 60% 2px;
 }
 
-th.current.asc {
+th.current.reverse {
     background-image: url(../images/control_arrow_up.gif);
     background-repeat: no-repeat;
     background-position: 60% 2px;
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 33380b0b2b..645cdfa601 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -121,8 +121,8 @@ class AlphaNav extends Widget
             }
 
             // sort order
-            if (!empty($this->action->order)) {
-                $params['asc'] = 'true';
+            if ($this->action->reverse) {
+                $params['reverse'] = 'true';
             }
 
             $current = $this->action->arg('filter');
diff --git a/plugins/Directory/lib/sortablesubscriptionlist.php b/plugins/Directory/lib/sortablesubscriptionlist.php
index a22aeadb3d..8f6e66d20a 100644
--- a/plugins/Directory/lib/sortablesubscriptionlist.php
+++ b/plugins/Directory/lib/sortablesubscriptionlist.php
@@ -68,16 +68,16 @@ class SortableSubscriptionList extends SubscriptionList
         );
 
         foreach ($tableHeaders as $id => $label) {
-            $attrs = array('id' => $id);
 
+            $attrs   = array('id' => $id);
             $current = (!empty($this->action->sort) && $this->action->sort == $id);
 
             if ($current || empty($this->action->sort) && $id == 'nickname') {
                 $attrs['class'] = 'current';
             }
 
-            if ($current && !$this->action->boolean('asc')) {
-                $attrs['class'] .= ' asc';
+            if ($current && $this->action->reverse) {
+                $attrs['class'] .= ' reverse';
                 $attrs['class'] = trim($attrs['class']);
             }
 
@@ -86,8 +86,12 @@ class SortableSubscriptionList extends SubscriptionList
             $linkAttrs = array();
             $params    = array('sort' => $id);
 
-            if ($current && !$this->action->boolean('asc')) {
-                $params['asc'] = "true";
+            if (!empty($this->action->q)) {
+                $params['q'] = $this->action->q;
+            }
+
+            if ($current && !$this->action->reverse) {
+                $params['reverse'] = 'true';
             }
 
             $args = array();
@@ -108,7 +112,7 @@ class SortableSubscriptionList extends SubscriptionList
 
         $this->out->element('th', array('id' => 'subscriptions'), 'Subscriptions');
         $this->out->element('th', array('id' => 'notices'), 'Notices');
-        //$this->out->element('th', array('id' => 'controls'), 'Controls');
+        $this->out->element('th', array('id' => 'controls'), null);
 
         $this->out->elementEnd('tr');
         $this->out->elementEnd('thead');

From 00c14ffa88c508d1675881e6a20b70f2b1288963 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sun, 6 Mar 2011 22:07:42 -0800
Subject: [PATCH 08/17] Better instructions, and better empty search results
 messages.

---
 plugins/Directory/actions/userdirectory.php | 50 ++++++++++++++-------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 005fb787d3..20ec5c19e3 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -91,20 +91,18 @@ class UserdirectoryAction extends Action
 
         if ($this->filter == 'all') {
             if ($this->page != 1) {
-                return(sprintf(_m('All users, page %d'), $this->page));
+                return(sprintf(_m('User Directory, page %d'), $this->page));
             }
-            return _m('All users');
-        }
-
-        if ($this->page == 1) {
+            return _m('User directory');
+        } else if ($this->page == 1) {
             return sprintf(
-                _m('Users with nicknames beginning with %s'),
-                $this->filter
+                _m('User directory - %s'),
+                strtoupper($this->filter)
             );
         } else {
             return sprintf(
-                _m('Users with nicknames starting with %s, page %d'),
-                $this->filter,
+                _m('User directory - %s, page %d'),
+                strtoupper($this->filter),
                 $this->page
             );
         }
@@ -117,7 +115,12 @@ class UserdirectoryAction extends Action
      */
     function getInstructions()
     {
-        return _('User directory');
+        // TRANS: %%site.name%% is the name of the StatusNet site.
+        return _(
+            'Search for people on %%site.name%% by their name, '
+            . 'location, or interests. Separate the terms by spaces; '
+            . ' they must be 3 characters or more.'
+        );
     }
 
     /**
@@ -362,11 +365,28 @@ class UserdirectoryAction extends Action
      */
     function showEmptyListMessage()
     {
-        $message = sprintf(_m('No users starting with **%s**'), $this->filter);
-
-        $this->elementStart('div', 'guide');
-        $this->raw(common_markup_to_html($message));
-        $this->elementEnd('div');
+        if (!empty($this->filter) && ($this->filter != 'all')) {
+            $this->element(
+                'p',
+                'error',
+                sprintf(
+                    _m('No users starting with %s'),
+                    $this->filter
+                )
+            );
+        } else {
+            $this->element('p', 'error', _('No results.'));
+            $message = _m(<<<E_O_T
+* Make sure all words are spelled correctly.
+* Try different keywords.
+* Try more general keywords.
+* Try fewer keywords.
+E_O_T
+);
+            $this->elementStart('div', 'help instructions');
+            $this->raw(common_markup_to_html($message));
+            $this->elementEnd('div');
+        }
     }
 
 }

From 884c3d06d243b961ef5e7d7d47ceac78996918e6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 7 Mar 2011 15:11:38 -0500
Subject: [PATCH 09/17] mailboxes were wrongly overriding global menu

---
 lib/mailbox.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/mailbox.php b/lib/mailbox.php
index cb56eb5904..e9e4f78c6b 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -92,12 +92,6 @@ class MailboxAction extends CurrentUserDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showNoticeForm()
     {
         $message_form = new MessageForm($this);

From 9a837ee33b5817df292e3ceffd5b2bd81d1cde34 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 13:36:15 -0800
Subject: [PATCH 10/17] Doc comments for MicroAppPlugin

---
 lib/microappplugin.php              | 140 +++++++++++++++++++++++++++-
 plugins/Bookmark/BookmarkPlugin.php |   2 +-
 2 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index dbbc6262af..8bc657f44a 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -51,20 +51,157 @@ if (!defined('STATUSNET')) {
 
 abstract class MicroAppPlugin extends Plugin
 {
+    /**
+     * Returns a localized string which represents this micro-app,
+     * to be shown to users selecting what type of post to make.
+     * This is paired with the key string in $this->tag().
+     *
+     * All micro-app classes must override this method.
+     *
+     * @return string
+     */
     abstract function appTitle();
+
+    /**
+     * Returns a key string which represents this micro-app in HTML
+     * ids etc, as when offering selection of what type of post to make.
+     * This is paired with the user-visible localizable $this->appTitle().
+     *
+     * All micro-app classes must override this method.
+     */
     abstract function tag();
+
+    /**
+     * Return a list of ActivityStreams object type URIs
+     * which this micro-app handles. Default implementations
+     * of the base class will use this list to check if a
+     * given ActivityStreams object belongs to us, via
+     * $this->isMyNotice() or $this->isMyActivity.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme can we confirm that these types are the same
+     * for Atom and JSON streams? Any limitations or issues?
+     *
+     * @return array of strings
+     */
     abstract function types();
-    abstract function saveNoticeFromActivity($activity, $actor, $options);
+
+    /**
+     * Given a parsed ActivityStreams activity, your plugin
+     * gets to figure out how to actually save it into a notice
+     * and any additional data structures you require.
+     *
+     * This will handle things received via AtomPub, OStatus
+     * (PuSH and Salmon transports), or ActivityStreams-based
+     * backup/restore of account data.
+     *
+     * You should be able to accept as input the output from your
+     * $this->activityObjectFromNotice(). Where applicable, try to
+     * use existing ActivityStreams structures and object types,
+     * and be liberal in accepting input from what might be other
+     * compatible apps.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme are there any standard options?
+     *
+     * @param Activity $activity
+     * @param Profile $actor
+     * @param array $options=array()
+     *
+     * @return Notice the resulting notice
+     */
+    abstract function saveNoticeFromActivity($activity, $actor, $options=array());
+
+    /**
+     * Given an existing Notice object, your plugin gets to
+     * figure out how to arrange it into an ActivityStreams
+     * object.
+     *
+     * This will be how your specialized notice gets output in
+     * Atom feeds and JSON-based ActivityStreams output, including
+     * account backup/restore and OStatus (PuSH and Salmon transports).
+     *
+     * You should be able to round-trip data from this format back
+     * through $this->saveNoticeFromActivity(). Where applicable, try
+     * to use existing ActivityStreams structures and object types,
+     * and consider interop with other compatible apps.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @fixme this outputs an ActivityObject, not an Activity. Any compat issues?
+     *
+     * @param Notice $notice
+     *
+     * @return ActivityObject
+     */
     abstract function activityObjectFromNotice($notice);
+
+    /**
+     * Custom HTML output for your special notice; called when a
+     * matching notice turns up in a NoticeListItem.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param Notice $notice
+     * @param HTMLOutputter $out
+     */
     abstract function showNotice($notice, $out);
+
+    /**
+     * When building the primary notice form, we'll fetch also some
+     * alternate forms for specialized types -- that's you!
+     *
+     * Return a custom Widget or Form object for the given output
+     * object, and it'll be included in the HTML output. Beware that
+     * your form may be initially hidden.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param HTMLOutputter $out
+     * @return Widget
+     */
     abstract function entryForm($out);
+
+    /**
+     * When a notice is deleted, you'll be called here for a chance
+     * to clean up any related resources.
+     *
+     * All micro-app classes must override this method.
+     *
+     * @param Notice $notice
+     */
     abstract function deleteRelated($notice);
 
+    /**
+     * Check if a given notice object should be handled by this micro-app
+     * plugin.
+     *
+     * The default implementation checks against the activity type list
+     * returned by $this->types(). You can override this method to expand
+     * your checks.
+     *
+     * @param Notice $notice
+     * @return boolean
+     */
     function isMyNotice($notice) {
         $types = $this->types();
         return in_array($notice->object_type, $types);
     }
 
+    /**
+     * Check if a given ActivityStreams activity should be handled by this
+     * micro-app plugin.
+     *
+     * The default implementation checks against the activity type list
+     * returned by $this->types(), and requires that exactly one matching
+     * object be present. You can override this method to expand
+     * your checks or to compare the activity's verb, etc.
+     *
+     * @param Activity $activity
+     * @return boolean
+     */
     function isMyActivity($activity) {
         $types = $this->types();
         return (count($activity->objects) == 1 &&
@@ -73,6 +210,7 @@ abstract class MicroAppPlugin extends Plugin
 
     /**
      * When a notice is deleted, delete the related objects
+     * by calling the overridable $this->deleteRelated().
      *
      * @param Notice $notice Notice being deleted
      * 
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 44f3db7867..1dc71d9dfa 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -365,8 +365,8 @@ class BookmarkPlugin extends MicroAppPlugin
     /**
      * Save a bookmark from an activity
      *
-     * @param Profile  $profile  Profile to use as author
      * @param Activity $activity Activity to save
+     * @param Profile  $profile  Profile to use as author
      * @param array    $options  Options to pass to bookmark-saving code
      *
      * @return Notice resulting notice

From b431a3b21686b67f2b8fc95feeb03f545e8e3ce3 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 14:32:14 -0800
Subject: [PATCH 11/17] Rearrange alphanav to better fit 3CL

---
 plugins/Directory/DirectoryPlugin.php       |  2 +-
 plugins/Directory/actions/userdirectory.php | 13 +++++++++++--
 plugins/Directory/lib/alphanav.php          |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php
index 50a0da7cf9..541ec556bf 100644
--- a/plugins/Directory/DirectoryPlugin.php
+++ b/plugins/Directory/DirectoryPlugin.php
@@ -121,7 +121,7 @@ class DirectoryPlugin extends Plugin
         $m->connect(
             'directory/users/:filter',
             array('action' => 'userdirectory'),
-            array('filter' => '[0-9a-zA-Z_]{1,64}')
+            array('filter' => '([0-9a-zA-Z_]{1,64}|0-9)')
         );
 
         return true;
diff --git a/plugins/Directory/actions/userdirectory.php b/plugins/Directory/actions/userdirectory.php
index 20ec5c19e3..24d91ad772 100644
--- a/plugins/Directory/actions/userdirectory.php
+++ b/plugins/Directory/actions/userdirectory.php
@@ -213,7 +213,7 @@ class UserdirectoryAction extends Action
 
         $this->elementStart('div', array('id' => 'user_directory'));
 
-        $alphaNav = new AlphaNav($this, true, array('All'));
+        $alphaNav = new AlphaNav($this, false, false, array('0-9', 'All'));
         $alphaNav->show();
 
         $profile = null;
@@ -320,7 +320,16 @@ class UserdirectoryAction extends Action
             $sort   = $this->getSortKey();
             $sql    = 'SELECT profile.* FROM profile, user WHERE profile.id = user.id';
 
-            if ($this->filter != 'all') {
+            switch($this->filter)
+            {
+            case 'all':
+                // NOOP
+                break;
+            case '0-9':
+                $sql .=
+                    '  AND LEFT(profile.nickname, 1) BETWEEN \'0\' AND \'9\'';
+                break;
+            default:
                 $sql .= sprintf(
                     ' AND LEFT(LOWER(profile.nickname), 1) = \'%s\'',
                     $this->filter
diff --git a/plugins/Directory/lib/alphanav.php b/plugins/Directory/lib/alphanav.php
index 645cdfa601..dadb589094 100644
--- a/plugins/Directory/lib/alphanav.php
+++ b/plugins/Directory/lib/alphanav.php
@@ -75,11 +75,11 @@ class AlphaNav extends Widget
             $this->filters = array_merge($this->filters, range(0, 9));
         }
 
+        $this->filters = array_merge($this->filters, range('A', 'Z'));
+
         if ($append) {
             $this->filters = array_merge($this->filters, $append);
         }
-
-        $this->filters = array_merge($this->filters, range('A', 'Z'));
     }
 
     /**

From 541613ce69be049dd93a9b05c82ad22b4d101714 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 15:15:21 -0800
Subject: [PATCH 12/17] More doc comments on MicroApp stuff; some of the
 show-notice code & the ActivityStreams stuff is a bit wonky and may need
 smoothing out

---
 lib/activityobject.php              | 7 ++++++-
 lib/microappplugin.php              | 6 ++++++
 plugins/Bookmark/BookmarkPlugin.php | 7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/activityobject.php b/lib/activityobject.php
index de2fcab767..d620bf27bb 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -613,6 +613,8 @@ class ActivityObject
             $this->poco->outputTo($xo);
         }
 
+        // @fixme there's no way here to make a tree; elements can only contain plaintext
+        // @fixme these may collide with JSON extensions
         foreach ($this->extra as $el) {
             list($extraTag, $attrs, $content) = $el;
             $xo->element($extraTag, $attrs, $content);
@@ -697,6 +699,7 @@ class ActivityObject
         //
         // We can probably use the whole schema URL here but probably the
         // relative simple name is easier to parse
+        // @fixme this breaks extension URIs
         $object['type'] = substr($this->type, strrpos($this->type, '/') + 1);
 
         // summary
@@ -708,7 +711,9 @@ class ActivityObject
         $object['url'] = $this->id;
 
         /* Extensions */
-
+        // @fixme these may collide with XML extensions
+        // @fixme multiple tags of same name will overwrite each other
+        // @fixme text content from XML extensions will be lost
         foreach ($this->extra as $e) {
             list($objectName, $props, $txt) = $e;
             $object[$objectName] = $props;
diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index 8bc657f44a..93b70a0324 100644
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -146,6 +146,10 @@ abstract class MicroAppPlugin extends Plugin
      *
      * @param Notice $notice
      * @param HTMLOutputter $out
+     *
+     * @fixme WARNING WARNING WARNING base plugin stuff below tries to close
+     * a div that this function opens in the BookmarkPlugin child class.
+     * This is probably wrong.
      */
     abstract function showNotice($notice, $out);
 
@@ -232,6 +236,8 @@ abstract class MicroAppPlugin extends Plugin
      * @param NoticeListItem $nli The list item being shown.
      *
      * @return boolean hook value
+     *
+     * @fixme WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
      */
 
     function onStartShowNoticeItem($nli)
diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 1dc71d9dfa..6c3f8cdc28 100644
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -508,6 +508,13 @@ class BookmarkPlugin extends MicroAppPlugin
         return $object;
     }
 
+    /**
+     * @fixme WARNING WARNING WARNING this opens a 'div' that is apparently closed by MicroAppPlugin
+     * @fixme that's probably wrong?
+     *
+     * @param Notice $notice
+     * @param HTMLOutputter $out
+     */
     function showNotice($notice, $out)
     {
         $nb = Bookmark::getByNotice($notice);

From 68a3246f1cb1debf45687770fdf840af778694da Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Mon, 7 Mar 2011 17:18:30 -0800
Subject: [PATCH 13/17] Fixup sphinx plugin to have additional sort orders

---
 plugins/SphinxSearch/sphinxsearch.php | 32 ++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/plugins/SphinxSearch/sphinxsearch.php b/plugins/SphinxSearch/sphinxsearch.php
index 1ce9bfd72d..46b5e3e28a 100644
--- a/plugins/SphinxSearch/sphinxsearch.php
+++ b/plugins/SphinxSearch/sphinxsearch.php
@@ -73,9 +73,39 @@ class SphinxSearch extends SearchEngine
 
     function set_sort_mode($mode)
     {
-        if ('chron' === $mode) {
+        switch ($mode) {
+        case 'chron':
             $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
             return $this->target->orderBy('id desc');
+            break;
+        case 'reverse_chron':
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'created_ts');
+            return $this->target->orderBy('id asc');
+            break;
+        case 'nickname_desc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'nickname');
+                return $this->target->orderBy('id desc');
+            }
+            break;
+        case 'nickname_asc':
+            if ($this->table != 'profile') {
+                throw new Exception(
+                    'nickname_desc sort mode can only be use when searching profile.'
+                );
+            } else {
+                $this->sphinx->SetSortMode(SPH_SORT_ATTR_ASC, 'nickname');
+                return $this->target->orderBy('id asc');
+            }
+            break;
+        default:
+            $this->sphinx->SetSortMode(SPH_SORT_ATTR_DESC, 'created_ts');
+            return $this->target->orderBy('id desc');
+            break;
         }
     }
 

From b9e2c727404b603bb97dc7c6ef75e3244c4506f3 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Tue, 8 Mar 2011 02:18:32 +0100
Subject: [PATCH 14/17] Localisation updates from http://translatewiki.net.

---
 locale/ar/LC_MESSAGES/statusnet.po            | 212 +++---
 locale/arz/LC_MESSAGES/statusnet.po           | 215 +++---
 locale/bg/LC_MESSAGES/statusnet.po            | 210 +++---
 locale/br/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/ca/LC_MESSAGES/statusnet.po            | 263 ++++---
 locale/cs/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/de/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/en_GB/LC_MESSAGES/statusnet.po         | 213 +++---
 locale/eo/LC_MESSAGES/statusnet.po            | 363 +++++-----
 locale/es/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/fa/LC_MESSAGES/statusnet.po            | 229 +++----
 locale/fi/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/fr/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/fur/LC_MESSAGES/statusnet.po           | 225 +++---
 locale/gl/LC_MESSAGES/statusnet.po            | 262 ++++---
 locale/hsb/LC_MESSAGES/statusnet.po           | 220 +++---
 locale/hu/LC_MESSAGES/statusnet.po            | 219 +++---
 locale/ia/LC_MESSAGES/statusnet.po            | 232 +++----
 locale/it/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/ja/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/ka/LC_MESSAGES/statusnet.po            | 220 +++---
 locale/ko/LC_MESSAGES/statusnet.po            | 213 +++---
 locale/mk/LC_MESSAGES/statusnet.po            | 236 +++----
 locale/ml/LC_MESSAGES/statusnet.po            | 223 +++---
 locale/nb/LC_MESSAGES/statusnet.po            | 221 +++---
 locale/nl/LC_MESSAGES/statusnet.po            | 232 +++----
 locale/nn/LC_MESSAGES/statusnet.po            | 212 +++---
 locale/pl/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/pt/LC_MESSAGES/statusnet.po            | 648 ++++++++----------
 locale/pt_BR/LC_MESSAGES/statusnet.po         | 211 +++---
 locale/ru/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/statusnet.pot                          | 512 +++++++-------
 locale/sv/LC_MESSAGES/statusnet.po            | 211 +++---
 locale/te/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/tr/LC_MESSAGES/statusnet.po            | 215 +++---
 locale/uk/LC_MESSAGES/statusnet.po            | 389 +++++------
 locale/zh_CN/LC_MESSAGES/statusnet.po         | 211 +++---
 .../locale/pt/LC_MESSAGES/AccountManager.po   |  27 +
 .../locale/uk/LC_MESSAGES/AccountManager.po   |  27 +
 plugins/Aim/locale/pt/LC_MESSAGES/Aim.po      |  34 +
 plugins/Aim/locale/uk/LC_MESSAGES/Aim.po      |  34 +
 plugins/Bookmark/locale/Bookmark.pot          |   8 +-
 .../locale/br/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/de/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/fr/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/ia/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/mk/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/my/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/nl/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/ru/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/te/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/uk/LC_MESSAGES/Bookmark.po         |  11 +-
 .../locale/zh_CN/LC_MESSAGES/Bookmark.po      |  11 +-
 .../Disqus/locale/pt/LC_MESSAGES/Disqus.po    |  45 ++
 .../locale/uk/LC_MESSAGES/ExtendedProfile.po  |  98 +++
 .../locale/pt/LC_MESSAGES/ForceGroup.po       |  36 +
 .../pt/LC_MESSAGES/GroupPrivateMessage.po     |  52 ++
 plugins/Irc/locale/uk/LC_MESSAGES/Irc.po      |  39 ++
 .../locale/pt/LC_MESSAGES/Linkback.po         |  33 +
 .../locale/uk/LC_MESSAGES/MobileProfile.po    |  12 +-
 .../locale/pt/LC_MESSAGES/ModHelper.po        |  28 +
 plugins/Msn/locale/pt/LC_MESSAGES/Msn.po      |  29 +
 plugins/Msn/locale/uk/LC_MESSAGES/Msn.po      |  31 +
 .../locale/pt/LC_MESSAGES/NoticeTitle.po      |  30 +
 .../uk/LC_MESSAGES/StrictTransportSecurity.po |  30 +
 plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po    |  35 +
 plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po    |  36 +
 67 files changed, 5229 insertions(+), 4712 deletions(-)
 create mode 100644 plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
 create mode 100644 plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
 create mode 100644 plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
 create mode 100644 plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
 create mode 100644 plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
 create mode 100644 plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
 create mode 100644 plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
 create mode 100644 plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
 create mode 100644 plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
 create mode 100644 plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
 create mode 100644 plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
 create mode 100644 plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
 create mode 100644 plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
 create mode 100644 plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
 create mode 100644 plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po

diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index 5e39b68475..655d9cc767 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -12,19 +12,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:06+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:04:58+0000\n"
 "Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
 "2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
 "99) ? 4 : 5 ) ) ) );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5911,82 +5911,9 @@ msgstr "رُد"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "الرئيسية"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "مسار %s الزمني"
-
-msgid "Your profile"
-msgstr "ملفك الشخصي"
-
-msgid "Public"
-msgstr "عام"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ابحث عن أشخاص على هذا الموقع"
-
-msgid "Settings"
-msgstr "إعدادات"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ضبط المستخدم"
-
-msgid "Logout"
-msgstr "اخرج"
-
-msgid "Logout from the site"
-msgstr "اخرج من الموقع"
-
-msgid "Login to the site"
-msgstr "لُج إلى الموقع"
-
-msgid "Search"
-msgstr "ابحث"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ابحث في الموقع"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "الأسئلة المكررة"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "الشروط"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصية"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "المصدر"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "الجسر"
+msgid "Status"
+msgstr "ستاتس نت"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6810,6 +6737,12 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
 
+msgid "Home"
+msgstr "الرئيسية"
+
+msgid "Public"
+msgstr "عام"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
@@ -7426,6 +7359,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرسالة."
 
@@ -7504,6 +7449,20 @@ msgstr "رسالة"
 msgid "from"
 msgstr "من"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "لا يسمح لك بحذف هذه المجموعة."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "لا تحذف هذا المستخدم."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7621,24 +7580,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
+msgid "Your profile"
+msgstr "ملفك الشخصي"
+
 msgid "Replies"
 msgstr "الردود"
 
 msgid "Favorites"
 msgstr "المفضلات"
 
-msgid "Inbox"
-msgstr "صندوق الوارد"
-
-msgid "Your incoming messages"
-msgstr "رسائلك الواردة"
-
-msgid "Outbox"
-msgstr "صندوق الصادر"
-
-msgid "Your sent messages"
-msgstr "رسائلك المُرسلة"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7662,6 +7612,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "إعدادات"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المستخدم"
+
+msgid "Logout"
+msgstr "اخرج"
+
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
+
+msgid "Login to the site"
+msgstr "لُج إلى الموقع"
+
+msgid "Search"
+msgstr "ابحث"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ابحث في الموقع"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7771,6 +7748,39 @@ msgstr "ابحث عن محتويات في الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "مساعدة"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "عن"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "الأسئلة المكررة"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "الشروط"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصية"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "المصدر"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "اتصل"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "الجسر"
+
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
@@ -8077,20 +8087,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "المنظمة طويلة جدا (الأقصى %d حرفا)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "مسار %s الزمني"
 
 #, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "كنيات كيرة! العدد الأقصى هو %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "المحتوى"
+#~ msgid "Everyone on this site"
+#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 0b1b7510a7..f0c94461f9 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -11,19 +11,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:07+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:04:59+0000\n"
 "Language-Team: Egyptian Spoken Arabic <http://translatewiki.net/wiki/Portal:"
 "arz>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=6; plural= n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5947,85 +5947,9 @@ msgstr "رُد"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "الرئيسية"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "مسار %s الزمني"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "ملف المجموعه الشخصي"
-
-msgid "Public"
-msgstr "عام"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ابحث عن أشخاص على هذا الموقع"
-
-#, fuzzy
-msgid "Settings"
-msgstr "تظبيطات الـSMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "غيّر إعدادات ملفك الشخصي"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ضبط المسارات"
-
-msgid "Logout"
-msgstr "اخرج"
-
-msgid "Logout from the site"
-msgstr "اخرج من الموقع"
-
-msgid "Login to the site"
-msgstr "لُج إلى الموقع"
-
-msgid "Search"
-msgstr "ابحث"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ابحث فى الموقع"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "مساعدة"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "عن"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "الأسئله المكررة"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "الشروط"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصية"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "المصدر"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "اتصل"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "نبّه"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6823,6 +6747,12 @@ msgstr "اذهب إلى المُثبّت."
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
 
+msgid "Home"
+msgstr "الرئيسية"
+
+msgid "Public"
+msgstr "عام"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "احذف هذا المستخدم"
@@ -7422,6 +7352,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق الوارد"
+
+msgid "Your incoming messages"
+msgstr "رسائلك الواردة"
+
+msgid "Outbox"
+msgstr "صندوق الصادر"
+
+msgid "Your sent messages"
+msgstr "رسائلك المُرسلة"
+
 msgid "Could not parse message."
 msgstr "تعذّر تحليل الرساله."
 
@@ -7500,6 +7442,20 @@ msgstr "رسالة"
 msgid "from"
 msgstr "من"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "لست عضوا فى تلك المجموعه."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "لا تحذف هذا الإشعار"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7617,24 +7573,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "تعذّر إدراج اشتراك جديد."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "ملف المجموعه الشخصي"
+
 msgid "Replies"
 msgstr "الردود"
 
 msgid "Favorites"
 msgstr "المفضلات"
 
-msgid "Inbox"
-msgstr "صندوق الوارد"
-
-msgid "Your incoming messages"
-msgstr "رسائلك الواردة"
-
-msgid "Outbox"
-msgstr "صندوق الصادر"
-
-msgid "Your sent messages"
-msgstr "رسائلك المُرسلة"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7658,6 +7606,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "تظبيطات الـSMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "غيّر إعدادات ملفك الشخصي"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ضبط المسارات"
+
+msgid "Logout"
+msgstr "اخرج"
+
+msgid "Logout from the site"
+msgstr "اخرج من الموقع"
+
+msgid "Login to the site"
+msgstr "لُج إلى الموقع"
+
+msgid "Search"
+msgstr "ابحث"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ابحث فى الموقع"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7768,6 +7744,40 @@ msgstr "ابحث عن محتويات فى الإشعارات"
 msgid "Find groups on this site"
 msgstr "ابحث عن مجموعات على هذا الموقع"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "مساعدة"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "عن"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "الأسئله المكررة"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "الشروط"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصية"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "المصدر"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "اتصل"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "نبّه"
+
 msgid "Untitled section"
 msgstr "قسم غير مُعنون"
 
@@ -8076,17 +8086,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "المنظمه طويله جدا (اكتر حاجه %d رمز)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "مسار %s الزمني"
 
 #, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "المحتوى"
+#~ msgid "Everyone on this site"
+#~ msgstr "ابحث عن أشخاص على هذا الموقع"
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index b783c1fa31..e9a3b189d3 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:08+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:00+0000\n"
 "Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5954,83 +5954,9 @@ msgstr "Отговор"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Лична страница"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Поток на %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Профил на групата"
-
-msgid "Public"
-msgstr "Общ поток"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Търсене на хора в сайта"
-
-msgid "Settings"
-msgstr "Настройки за SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Промяна настройките на профила"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Настройка на пътищата"
-
-msgid "Logout"
-msgstr "Изход"
-
-msgid "Logout from the site"
-msgstr "Излизане от сайта"
-
-msgid "Login to the site"
-msgstr "Влизане в сайта"
-
-msgid "Search"
-msgstr "Търсене"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Търсене в сайта"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помощ"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Относно"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Въпроси"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Условия"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Поверителност"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Изходен код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Табелка"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6811,6 +6737,12 @@ msgstr "Влизане в сайта"
 msgid "Database error"
 msgstr "Грешка в базата от данни"
 
+msgid "Home"
+msgstr "Лична страница"
+
+msgid "Public"
+msgstr "Общ поток"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Изтриване на този потребител"
@@ -7399,6 +7331,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Входящи"
+
+msgid "Your incoming messages"
+msgstr "Получените от вас съобщения"
+
+msgid "Outbox"
+msgstr "Изходящи"
+
+msgid "Your sent messages"
+msgstr "Изпратените от вас съобщения"
+
 msgid "Could not parse message."
 msgstr "Грешка при обработка на съобщението"
 
@@ -7476,6 +7420,20 @@ msgstr "Съобщение"
 msgid "from"
 msgstr "от"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Не членувате в тази група."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Да не се изтрива бележката"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7589,24 +7547,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добавяне на нов абонамент."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Профил на групата"
+
 msgid "Replies"
 msgstr "Отговори"
 
 msgid "Favorites"
 msgstr "Любими"
 
-msgid "Inbox"
-msgstr "Входящи"
-
-msgid "Your incoming messages"
-msgstr "Получените от вас съобщения"
-
-msgid "Outbox"
-msgstr "Изходящи"
-
-msgid "Your sent messages"
-msgstr "Изпратените от вас съобщения"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7630,6 +7580,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Настройки за SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Промяна настройките на профила"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Настройка на пътищата"
+
+msgid "Logout"
+msgstr "Изход"
+
+msgid "Logout from the site"
+msgstr "Излизане от сайта"
+
+msgid "Login to the site"
+msgstr "Влизане в сайта"
+
+msgid "Search"
+msgstr "Търсене"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Търсене в сайта"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7742,6 +7719,39 @@ msgstr "Търсене в съдържанието на бележките"
 msgid "Find groups on this site"
 msgstr "Търсене на групи в сайта"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помощ"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Относно"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Въпроси"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Условия"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Поверителност"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Изходен код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Табелка"
+
 msgid "Untitled section"
 msgstr "Неозаглавен раздел"
 
@@ -8028,16 +8038,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Пълното име е твърде дълго (макс. 255 знака)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Описанието е твърде дълго (до %d символа)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Името на местоположението е твърде дълго (макс. 255 знака)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Поток на %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Съдържание"
+#~ msgid "Everyone on this site"
+#~ msgstr "Търсене на хора в сайта"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 9e987d19f4..b6aefb027d 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:09+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:02+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5867,80 +5867,9 @@ msgstr "Respont"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Degemer"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Oberezhioù %s"
-
-msgid "Your profile"
-msgstr "Ho profil"
-
-msgid "Public"
-msgstr "Foran"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Klask tud el lec'hienn-mañ"
-
-msgid "Settings"
-msgstr "Arventennoù"
-
-msgid "Change your personal settings"
-msgstr "Kemmañ ho arventennoù hiniennel"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Kefluniadur an implijer"
-
-msgid "Logout"
-msgstr "Digevreañ"
-
-msgid "Logout from the site"
-msgstr "Digevreañ diouzh al lec'hienn"
-
-msgid "Login to the site"
-msgstr "Kevreañ d'al lec'hienn"
-
-msgid "Search"
-msgstr "Klask"
-
-msgid "Search the site"
-msgstr "Klask el lec'hienn"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Skoazell"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Diwar-benn"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAG"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "AIH"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Prevezded"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Mammenn"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Darempred"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badj"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6704,6 +6633,12 @@ msgstr "Mont d'ar meziant staliañ"
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
 
+msgid "Home"
+msgstr "Degemer"
+
+msgid "Public"
+msgstr "Foran"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Diverkañ an implijer-mañ"
@@ -7285,6 +7220,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Boest resev"
+
+msgid "Your incoming messages"
+msgstr "Ar gemennadennoù ho peus resevet"
+
+msgid "Outbox"
+msgstr "Boest kas"
+
+msgid "Your sent messages"
+msgstr "Ar c'hemenadennoù kaset ganeoc'h"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
@@ -7364,6 +7311,20 @@ msgstr "Kemennadennoù"
 msgid "from"
 msgstr "eus"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "N'oc'h ket aotreet da zilemel ar gont-mañ."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Arabat dilemel an implijer-mañ"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7477,24 +7438,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
+msgid "Your profile"
+msgstr "Ho profil"
+
 msgid "Replies"
 msgstr "Respontoù"
 
 msgid "Favorites"
 msgstr "Pennrolloù"
 
-msgid "Inbox"
-msgstr "Boest resev"
-
-msgid "Your incoming messages"
-msgstr "Ar gemennadennoù ho peus resevet"
-
-msgid "Outbox"
-msgstr "Boest kas"
-
-msgid "Your sent messages"
-msgstr "Ar c'hemenadennoù kaset ganeoc'h"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7518,6 +7470,31 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Arventennoù"
+
+msgid "Change your personal settings"
+msgstr "Kemmañ ho arventennoù hiniennel"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Kefluniadur an implijer"
+
+msgid "Logout"
+msgstr "Digevreañ"
+
+msgid "Logout from the site"
+msgstr "Digevreañ diouzh al lec'hienn"
+
+msgid "Login to the site"
+msgstr "Kevreañ d'al lec'hienn"
+
+msgid "Search"
+msgstr "Klask"
+
+msgid "Search the site"
+msgstr "Klask el lec'hienn"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7629,6 +7606,39 @@ msgstr "Klask alioù en danvez"
 msgid "Find groups on this site"
 msgstr "Klask strolladoù el lec'hienn-mañ"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Skoazell"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Diwar-benn"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAG"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "AIH"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Prevezded"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Mammenn"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Darempred"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badj"
+
 msgid "Untitled section"
 msgstr "Rann hep titl"
 
@@ -7914,21 +7924,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Re hir eo an anv klok (255 arouezenn d'ar muiañ)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Oberezhioù %s"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "re hir eo an deskrivadur (%d arouezenn d'ar muiañ)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Re hir eo al lec'hiadur (255 arouezenn d'ar muiañ)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Re a aliasoù ! %d d'ar muiañ."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Evezhiadenn"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Ouzhpennañ un evezhiadenn..."
+#, fuzzy
+#~ msgid "Everyone on this site"
+#~ msgstr "Klask tud el lec'hienn-mañ"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 0ccbd9d1d9..37f2527a9f 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -16,17 +16,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:10+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:03+0000\n"
 "Language-Team: Catalan <http://translatewiki.net/wiki/Portal:ca>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2590,7 +2590,7 @@ msgstr "Adreça de missatgeria instantània"
 
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Nom en pantalla %s"
 
 #. TRANS: Header for IM preferences form.
 #, fuzzy
@@ -2634,9 +2634,8 @@ msgstr "S'han desat les preferències."
 msgid "No screenname."
 msgstr "Cap sobrenom."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Cap avís."
+msgstr "No hi ha cap transport."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 #, fuzzy
@@ -2959,9 +2958,8 @@ msgid "Type"
 msgstr "Tipus"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccioneu la llicència"
+msgstr "Seleccioneu una llicència."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3000,9 +2998,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL de la imatge que es mostrarà juntament amb la llicència."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Desa els paràmetres de la llicència"
+msgstr "Desa els paràmetres de la llicència."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3039,10 +3036,9 @@ msgstr ""
 "compartits!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Inici de sessió"
+msgstr "Inicia una sessió"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3136,9 +3132,8 @@ msgstr "Nou missatge"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "No podeu enviar un misssatge a aquest usuari."
+msgstr "No podeu enviar un missatge a l'usuari."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -3686,16 +3681,15 @@ msgstr "Usuaris que s'han etiquetat amb %1$s - pàgina %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Inhabilitat"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Aquesta acció només accepta sol·licituds POST."
 
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "No podeu eliminar els usuaris."
+msgstr "No es poden administrar els connectors."
 
 #, fuzzy
 msgid "No such plugin."
@@ -3704,7 +3698,7 @@ msgstr "No existeix la pàgina."
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitat"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3717,15 +3711,19 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Es poden configurar i habilitar connectors addicionals manualment. Vegeu la "
+"<a href=\"http://status.net/wiki/Plugins\">documentació en línia sobre els "
+"connectors</a> per a més detalls."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Llengua per defecte"
+msgstr "Connectors per defecte"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"S'han inhabilitat tots els connectors per defecte del fitxer de configuració "
+"del lloc."
 
 msgid "Invalid notice content."
 msgstr "El contingut de l'avís no és vàlid."
@@ -5309,7 +5307,7 @@ msgid "[none]"
 msgstr "Cap"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[intern]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5560,9 +5558,8 @@ msgstr "Visualitza els dissenys de perfil"
 msgid "Show or hide profile designs."
 msgstr "Mostra o amaga els dissenys de perfil."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Fons"
+msgstr "Fitxer de fons"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -5966,92 +5963,17 @@ msgid "Show more"
 msgstr "Mostra més"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Respon"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Pàgina personal"
+msgstr "Escriviu una resposta..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s línia temporal"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil del grup"
-
-msgid "Public"
-msgstr "Públic"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Cerca gent en aquest lloc"
-
-msgid "Settings"
-msgstr "Paràmetres de l'SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Canvieu els paràmetres del vostre perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuració de l'usuari"
-
-msgid "Logout"
-msgstr "Finalitza la sessió"
-
-msgid "Logout from the site"
-msgstr "Finalitza la sessió del lloc"
-
-msgid "Login to the site"
-msgstr "Inicia una sessió al lloc"
-
-msgid "Search"
-msgstr "Cerca"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cerca al lloc"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Quant a"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntes més freqüents"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termes del servei"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privadesa"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Font"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacte"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insígnia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6278,9 +6200,8 @@ msgid "Set site license"
 msgstr "Defineix la llicència del lloc"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuració dels camins"
+msgstr "Configuració dels connectors"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6539,9 +6460,8 @@ msgstr ""
 "Avisos: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "No es pot crear el preferit."
+msgstr "No es pot crear el preferit: ja era preferit."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -6851,13 +6771,18 @@ msgstr "Vés a l'instal·lador."
 msgid "Database error"
 msgstr "Error de la base de dades"
 
+msgid "Home"
+msgstr "Pàgina personal"
+
+msgid "Public"
+msgstr "Públic"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimina l'usuari"
 
-#, fuzzy
 msgid "Change design"
-msgstr "Desa el disseny"
+msgstr "Canvia el disseny"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
 msgid "Change colours"
@@ -6881,7 +6806,6 @@ msgid "Upload file"
 msgstr "Puja un fitxer"
 
 #. TRANS: Instructions for form on profile design page.
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2Mb."
 msgstr ""
@@ -7526,6 +7450,18 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+msgid "Your incoming messages"
+msgstr "Els teus missatges rebuts"
+
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+msgid "Your sent messages"
+msgstr "Els teus missatges enviats"
+
 msgid "Could not parse message."
 msgstr "No es pot analitzar el missatge."
 
@@ -7603,6 +7539,20 @@ msgstr "Missatges"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No teniu permisos per eliminar el grup."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No eliminis l'usuari."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "El sobrenom no pot estar en blanc."
@@ -7717,24 +7667,15 @@ msgstr "Avís duplicat."
 msgid "Couldn't insert new subscription."
 msgstr "No s'ha pogut inserir una nova subscripció."
 
+msgid "Your profile"
+msgstr "El vostre perfil"
+
 msgid "Replies"
 msgstr "Respostes"
 
 msgid "Favorites"
 msgstr "Preferits"
 
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-msgid "Your incoming messages"
-msgstr "Els teus missatges rebuts"
-
-msgid "Outbox"
-msgstr "Safata de sortida"
-
-msgid "Your sent messages"
-msgstr "Els teus missatges enviats"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7747,17 +7688,41 @@ msgstr "Desconegut"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Inhabilita"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Habilita"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Paràmetres de l'SMS"
+
+msgid "Change your personal settings"
+msgstr "Canvieu els vostres paràmetres personals"
+
+msgid "Site configuration"
+msgstr "Configuració del lloc"
+
+msgid "Logout"
+msgstr "Finalitza la sessió"
+
+msgid "Logout from the site"
+msgstr "Finalitza la sessió del lloc"
+
+msgid "Login to the site"
+msgstr "Inicia una sessió al lloc"
+
+msgid "Search"
+msgstr "Cerca"
+
+msgid "Search the site"
+msgstr "Cerca al lloc"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7866,6 +7831,39 @@ msgstr "Cerca el contingut dels avisos"
 msgid "Find groups on this site"
 msgstr "Cerca grups en aquest lloc"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Quant a"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntes més freqüents"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termes del servei"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privadesa"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Font"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacte"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insígnia"
+
 msgid "Untitled section"
 msgstr "Secció sense títol"
 
@@ -8145,19 +8143,8 @@ msgstr "L'XML no és vàlid, hi manca l'arrel XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Es recupera la còpia de seguretat del fitxer '%s'."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "El vostre nom sencer és massa llarg (màx. 255 caràcters)."
+#~ msgid "Friends timeline"
+#~ msgstr "Línia temporal dels amics"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "la descripció és massa llarga (màx. %d caràcters)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "La localització és massa llarga (màx. 255 caràcters)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Hi ha massa àlies! Màxim %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contingut"
+#~ msgid "Everyone on this site"
+#~ msgstr "Tothom en aquest lloc"
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 041a6ca799..e97d4980e0 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:11+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:04+0000\n"
 "Language-Team: Czech <http://translatewiki.net/wiki/Portal:cs>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n >= 2 && n <= 4) ? 1 : "
 "2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6051,84 +6051,9 @@ msgstr "Odpovědět"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Moje stránky"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "časová osa %s"
-
-msgid "Your profile"
-msgstr "Profil skupiny"
-
-msgid "Public"
-msgstr "Veřejné"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Najít lidi na této stránce"
-
-msgid "Settings"
-msgstr "nastavení SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Změňte nastavení profilu"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Akce uživatele"
-
-msgid "Logout"
-msgstr "Odhlásit se"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Odhlášení z webu"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Přihlásit se na stránky"
-
-msgid "Search"
-msgstr "Hledat"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Prohledat stránky"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Nápověda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "O nás"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS (pravidla použití služby)"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Soukromí"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Zdroj"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Odznak"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6929,6 +6854,12 @@ msgstr "Jdi na instalaci."
 msgid "Database error"
 msgstr "Chyba databáze"
 
+msgid "Home"
+msgstr "Moje stránky"
+
+msgid "Public"
+msgstr "Veřejné"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Odstranit tohoto uživatele"
@@ -7612,6 +7543,18 @@ msgstr ""
 "zapojili ostatní uživatelé v rozhovoru. Lidé mohou posílat zprávy jen pro "
 "vaše oči."
 
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+msgid "Your incoming messages"
+msgstr "Vaše příchozí zprávy"
+
+msgid "Outbox"
+msgstr "Odeslaná pošta"
+
+msgid "Your sent messages"
+msgstr "Vaše odeslané zprávy"
+
 msgid "Could not parse message."
 msgstr "Nelze zpracovat zprávu."
 
@@ -7688,6 +7631,20 @@ msgstr "Zpráva"
 msgid "from"
 msgstr "od"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Nejste členem této skupiny."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Neodstraňujte toto oznámení"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7803,24 +7760,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Nelze vložit odebírání"
 
+msgid "Your profile"
+msgstr "Profil skupiny"
+
 msgid "Replies"
 msgstr "Odpovědi"
 
 msgid "Favorites"
 msgstr "Oblíbené"
 
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-msgid "Your incoming messages"
-msgstr "Vaše příchozí zprávy"
-
-msgid "Outbox"
-msgstr "Odeslaná pošta"
-
-msgid "Your sent messages"
-msgstr "Vaše odeslané zprávy"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7844,6 +7792,35 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "nastavení SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Změňte nastavení profilu"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Akce uživatele"
+
+msgid "Logout"
+msgstr "Odhlásit se"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Odhlášení z webu"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Přihlásit se na stránky"
+
+msgid "Search"
+msgstr "Hledat"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Prohledat stránky"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7953,6 +7930,39 @@ msgstr "Najít v obsahu oznámení"
 msgid "Find groups on this site"
 msgstr "Najít skupiny na této stránce"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Nápověda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "O nás"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS (pravidla použití služby)"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Soukromí"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Zdroj"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Odznak"
+
 msgid "Untitled section"
 msgstr "Oddíl bez názvu"
 
@@ -8243,19 +8253,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Celé jméno je moc dlouhé (maximální délka je 255 znaků)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Popis je příliš dlouhý (maximálně %d znaků)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Umístění je příliš dlouhé (maximálně 255 znaků)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Příliš mnoho aliasů! Maximálně %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "časová osa %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Obsah"
+#~ msgid "Everyone on this site"
+#~ msgstr "Najít lidi na této stránce"
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 1c7cad4a6e..939acc989b 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:12+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:05+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6052,83 +6052,9 @@ msgstr "Antworten"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Homepage"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s-Zeitleiste"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Gruppenprofil"
-
-msgid "Public"
-msgstr "Zeitleiste"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finde Leute auf dieser Seite"
-
-msgid "Settings"
-msgstr "SMS-Einstellungen"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ändern der Profileinstellungen"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Benutzereinstellung"
-
-msgid "Logout"
-msgstr "Abmelden"
-
-msgid "Logout from the site"
-msgstr "Von der Seite abmelden"
-
-msgid "Login to the site"
-msgstr "Auf der Seite anmelden"
-
-msgid "Search"
-msgstr "Suchen"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Website durchsuchen"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hilfe"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Über"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "AGB"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privatsphäre"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Quellcode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Plakette"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6924,6 +6850,12 @@ msgstr "Zur Installation gehen."
 msgid "Database error"
 msgstr "Datenbankfehler."
 
+msgid "Home"
+msgstr "Homepage"
+
+msgid "Public"
+msgstr "Zeitleiste"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Diesen Benutzer löschen"
@@ -7600,6 +7532,18 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
+msgid "Inbox"
+msgstr "Posteingang"
+
+msgid "Your incoming messages"
+msgstr "Deine eingehenden Nachrichten"
+
+msgid "Outbox"
+msgstr "Postausgang"
+
+msgid "Your sent messages"
+msgstr "Deine gesendeten Nachrichten"
+
 msgid "Could not parse message."
 msgstr "Konnte Nachricht nicht parsen."
 
@@ -7679,6 +7623,20 @@ msgstr "Nachricht"
 msgid "from"
 msgstr "von"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du darfst diese Gruppe nicht löschen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Diesen Benutzer nicht löschen"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7793,24 +7751,16 @@ msgstr "Doppelte Nachricht."
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppenprofil"
+
 msgid "Replies"
 msgstr "Antworten"
 
 msgid "Favorites"
 msgstr "Favoriten"
 
-msgid "Inbox"
-msgstr "Posteingang"
-
-msgid "Your incoming messages"
-msgstr "Deine eingehenden Nachrichten"
-
-msgid "Outbox"
-msgstr "Postausgang"
-
-msgid "Your sent messages"
-msgstr "Deine gesendeten Nachrichten"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7834,6 +7784,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS-Einstellungen"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändern der Profileinstellungen"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Benutzereinstellung"
+
+msgid "Logout"
+msgstr "Abmelden"
+
+msgid "Logout from the site"
+msgstr "Von der Seite abmelden"
+
+msgid "Login to the site"
+msgstr "Auf der Seite anmelden"
+
+msgid "Search"
+msgstr "Suchen"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Website durchsuchen"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7942,6 +7919,39 @@ msgstr "Durchsuche den Inhalt der Nachrichten"
 msgid "Find groups on this site"
 msgstr "Finde Gruppen auf dieser Seite"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hilfe"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Über"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "AGB"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privatsphäre"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Quellcode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Plakette"
+
 msgid "Untitled section"
 msgstr "Abschnitt ohne Titel"
 
@@ -8225,19 +8235,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr "Hole Backup von der Datei „%s“."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Der vollständige Name ist zu lang (maximal 255 Zeichen)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Die Beschreibung ist zu lang (max. %d Zeichen)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Der eingegebene Aufenthaltsort ist zu lang (maximal 255 Zeichen)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Zu viele Pseudonyme! Maximale Anzahl ist %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s-Zeitleiste"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Inhalt"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finde Leute auf dieser Seite"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index af6016977d..b7c4366f53 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:13+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:06+0000\n"
 "Language-Team: British English <http://translatewiki.net/wiki/Portal:en-gb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5979,83 +5979,9 @@ msgstr "Reply"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Homepage"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s timeline"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Group profile"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Find people on this site"
-
-msgid "Settings"
-msgstr "SMS settings"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Change your profile settings"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "User configuration"
-
-msgid "Logout"
-msgstr "Logout"
-
-msgid "Logout from the site"
-msgstr "Logout from the site"
-
-msgid "Login to the site"
-msgstr "Login to the site"
-
-msgid "Search"
-msgstr "Search"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Search site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "F.A.Q."
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Source"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badge"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6839,6 +6765,12 @@ msgstr "Go to the installer."
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Homepage"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Delete this user"
@@ -7429,6 +7361,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Inbox"
+
+msgid "Your incoming messages"
+msgstr "Your incoming messages"
+
+msgid "Outbox"
+msgstr "Outbox"
+
+msgid "Your sent messages"
+msgstr "Your sent messages"
+
 msgid "Could not parse message."
 msgstr "Could not parse message."
 
@@ -7505,6 +7449,20 @@ msgstr "Message"
 msgid "from"
 msgstr "from"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "You are not allowed to delete this group."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Do not delete this group"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7616,24 +7574,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Couldn't insert new subscription."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Group profile"
+
 msgid "Replies"
 msgstr "Replies"
 
 msgid "Favorites"
 msgstr "Favourites"
 
-msgid "Inbox"
-msgstr "Inbox"
-
-msgid "Your incoming messages"
-msgstr "Your incoming messages"
-
-msgid "Outbox"
-msgstr "Outbox"
-
-msgid "Your sent messages"
-msgstr "Your sent messages"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7657,6 +7607,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS settings"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Change your profile settings"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "User configuration"
+
+msgid "Logout"
+msgstr "Logout"
+
+msgid "Logout from the site"
+msgstr "Logout from the site"
+
+msgid "Login to the site"
+msgstr "Login to the site"
+
+msgid "Search"
+msgstr "Search"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Search site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7766,6 +7743,39 @@ msgstr "Find content of notices"
 msgid "Find groups on this site"
 msgstr "Find groups on this site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Help"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "About"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "F.A.Q."
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Source"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badge"
+
 msgid "Untitled section"
 msgstr "Untitled section"
 
@@ -8045,19 +8055,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Full name is too long (max 255 chars)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "description is too long (max %d chars)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Location is too long (max 255 chars)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Too many aliases! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s timeline"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Content"
+#~ msgid "Everyone on this site"
+#~ msgstr "Find people on this site"
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index b29239e094..fc4a68c796 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -17,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:14+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:07+0000\n"
 "Language-Team: Esperanto <http://translatewiki.net/wiki/Portal:eo>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -69,7 +69,7 @@ msgstr "Fermita"
 
 #. TRANS: Title for button to save access settings in site admin panel.
 msgid "Save access settings"
-msgstr "Konservu atingan agordon"
+msgstr "Konservi atingan agordon"
 
 #. TRANS: Tooltip for button to save access settings in site admin panel.
 #. TRANS: Button text for saving theme settings.
@@ -87,7 +87,7 @@ msgstr "Konservu atingan agordon"
 #. TRANS: Button text on profile design page to save settings.
 msgctxt "BUTTON"
 msgid "Save"
-msgstr "Konservu"
+msgstr "Konservi"
 
 #. TRANS: Server error when page not found (404).
 #. TRANS: Server error when page not found (404)
@@ -835,13 +835,13 @@ msgstr "La avizo jam ripetiĝis."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #, fuzzy
 msgid "HTTP method not supported."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Metodo de HTTP ne troviĝas."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
 #, fuzzy, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato ne subtenata."
+msgstr "Formato/aranĝo ne subtenata: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -862,9 +862,9 @@ msgid "Cannot delete this notice."
 msgstr "Ne povas forigi ĉi tiun avizon."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Forigi avizon"
+msgstr "Estas forigita la avizo %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -879,9 +879,8 @@ msgstr[0] "Tro longas. Longlimo por avizo estas %d signoj."
 msgstr[1] "Tro longas. Longlimo por avizo estas %d signoj."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr ""
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
@@ -938,7 +937,7 @@ msgstr "%s ĝisdatigoj de ĉiuj!"
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
 #, fuzzy
 msgid "Unimplemented."
-msgstr "Nerealiĝita metodo"
+msgstr "Nerealigita"
 
 #. TRANS: Title for Atom feed "repeated to me". %s is the user nickname.
 #, php-format
@@ -1006,24 +1005,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr "Mankas enhavo por avizo %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
 #, fuzzy, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Avizo kun tiu identigaĵo ne ekzistas."
+msgstr "Avizo kun identigaĵo \"%s\" jam ekzistas."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "API-metodo farata."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "Metodo de API ne troviĝas."
+msgstr "Uzanto ne ekzistas."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
@@ -1035,18 +1033,17 @@ msgstr "Ne ekzistas tia profilo."
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
 #, fuzzy, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
+msgstr "Avizoj, ŝatmarkitaj de %1$s ĉe %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
 #, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Estas neeble aldoni abonon de aliulo."
+msgstr "Estas neeble aldoni abonstaton por aliulo."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Serĉi enhavon ĉe la retejo"
+msgstr ""
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
 #, fuzzy
@@ -1087,18 +1084,18 @@ msgid "Can only handle join activities."
 msgstr "Serĉi enhavon ĉe la retejo"
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
 msgstr "Nekonata grupo."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
 #, fuzzy
 msgid "Already a member."
-msgstr "Ĉiuj grupanoj"
+msgstr "Jam ano."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#, fuzzy
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Blokita de administranto."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
 #, fuzzy
@@ -1169,9 +1166,9 @@ msgstr "Ne eblas forigi abonon de aliulo."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Abonantoj de %s"
+msgstr "Abonatoj de %1$s ĉe %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1262,7 +1259,6 @@ msgstr "Forigi"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Alŝuti"
@@ -1302,18 +1298,18 @@ msgstr "Vizaĝbildo forigita."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Sekurkopii la konton"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Nur ensalutinto rajtas ripeti avizon."
+msgstr "Nur ensalutintoj povas sekurkopii siajn kontojn."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
-msgstr ""
+msgstr "Vi ne rajtas sekurkopii vian konton."
 
 #. TRANS: Information displayed on the backup account page.
+#, fuzzy
 msgid ""
 "You can backup your account data in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format. This is an experimental feature and provides "
@@ -1321,16 +1317,20 @@ msgid ""
 "addresses is not backed up. Additionally, uploaded files and direct messages "
 "are not backed up."
 msgstr ""
+"Vi povas sekurkopii datumojn de via konto aranĝite laŭ <a href=\"http://"
+"activitystrea.ms/\">Activity Streams</a>. Realigo de la funkcio estas prova "
+"kaj provizas nekompletan sekurkopion; ne estas kopiataj privataj "
+"kontodatumoj kiel retpoŝtaj kaj tujmesaĝilaj adresoj. Krom tio, ne kopiiĝas "
+"alŝutitaj dosieroj kaj rektaj mesaĝoj."
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fono"
+msgstr "Sekurkopii"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Sekurkopii vian konton."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1485,9 +1485,8 @@ msgid "Only logged-in users can delete their account."
 msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Vi ne povas forviŝi vian konton."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
@@ -1506,15 +1505,16 @@ msgstr "Vizaĝbildo forigita."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Krei konton"
+msgstr "Forviŝo de konto"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Tio ĉi <strong>por ĉiam forviŝos</strong> viajn konto-datumojn el ĉi tiu "
+"servilo."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1523,6 +1523,8 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Ni forte rekomendas, ke vi <a href=\"%s\">sekurkopiu viajn datumojn</a> "
+"antaŭ la forviŝo."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1531,14 +1533,13 @@ msgstr "Konfirmi"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Enigu «%s» por konfirmi, ke vi volas forviŝi vian konton."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Vi ne povas forigi uzantojn."
+msgstr "Forviŝi nemalfareble vian konton"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1572,17 +1573,14 @@ msgstr ""
 "la datumbazo, inkluzive de ĉiu ekzistanta uzanto-konekto."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Ne forigu ĉi tiun aplikaĵon."
+msgstr "Ne forigi ĉi tiun aplikaĵon."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Viŝi ĉi tiun aplikon"
+msgstr "Forigi ĉi tiun aplikaĵon."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
 msgstr "Por povi forigi grupon, oni devas ensaluti."
 
@@ -1593,47 +1591,44 @@ msgid "No nickname or ID."
 msgstr "Ne estas alinomo aŭ ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Vi ne estas grupano."
+msgstr "Vi ne rajtas forigi ĉi tiun grupon."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
 #, fuzzy, php-format
 msgid "Could not delete group %s."
-msgstr "Malsukcesis ĝisdatigi grupon."
+msgstr "Malsukcesis forigi la grupon %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
 #, fuzzy, php-format
 msgid "Deleted group %s"
-msgstr "%1$s eksaniĝis de grupo %2$s"
+msgstr "Forigis la grupon %s"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
 #, fuzzy
 msgid "Delete group"
-msgstr "Forigi grupon"
+msgstr "Forigo de grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
-"datumbazo sen sekurkopio."
+"Ĉu vi certe volas forigi ĉi tiun grupon? Tio forviŝos ĉiujn datumojn pri la "
+"grupo el la datumbazo, sen sekurkopio. Publikaj avizoj en la grupo plu "
+"restos videblaj en apartaj tempstrioj."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Ne forigi la avizon"
+msgstr "Ne forigi ĉi tiun grupon"
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Forigi la uzanton"
+msgstr "Forigi ĉi tiun grupon."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1669,14 +1664,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Ĉu vi certe volas forigi la avizon?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Ne forigi la avizon"
+msgstr "Ne forviŝi ĉi tiun avizon."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Forigi la avizon"
+msgstr "Forviŝi ĉi tiun avizon."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1729,7 +1722,7 @@ msgstr "URL por la emblemo nevalida."
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
 #, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL por la emblemo nevalida."
+msgstr "URL por la SSLa emblemo nevalidas."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
@@ -1748,7 +1741,7 @@ msgstr "Reteja emblemo"
 #. TRANS: Field label for SSL StatusNet site logo.
 #, fuzzy
 msgid "SSL logo"
-msgstr "Reteja emblemo"
+msgstr "SSLa emblemo"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 msgid "Change theme"
@@ -1807,7 +1800,6 @@ msgid "Tile background image"
 msgstr "Ripeti la fonbildon"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
 msgstr "Ŝanĝi kolorojn"
 
@@ -1840,10 +1832,9 @@ msgid "Custom CSS"
 msgstr "Propra CSS"
 
 #. TRANS: Button text for resetting theme settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Uzu defaŭlton"
+msgstr "Uzi defaŭlton"
 
 #. TRANS: Title for button for resetting theme settings.
 #, fuzzy
@@ -2183,7 +2174,7 @@ msgstr "Ĉi tiu avizo jam estas ŝatata."
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
 #, fuzzy
 msgid "Disfavor favorite."
-msgstr "Malŝati ŝataton."
+msgstr "Forigi ŝatmarkon."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2500,14 +2491,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Ĝisdatigoj de grupano de %1$s ĉe %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupoj"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupoj, paĝo %d"
@@ -2604,9 +2594,9 @@ msgstr ""
 msgid "IM is not available."
 msgstr "Tujmesaĝilo ne estas disponebla."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Nuna konfirmita retpoŝtadreso."
+msgstr "Nuna konfirmita adreso je %s."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
@@ -2615,8 +2605,8 @@ msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Atendante konfirmon por la adreso. Kontrolu vian Jabber/GTalk-konton por "
-"mesaĝo kun pli da gvido. (Ĉu vi aldonis %s al via amikolisto?)"
+"Atendante konfirmon por la adreso. Kontrolu vian konton je %s pri mesaĝo kun "
+"pluaj instrukcioj. (Ĉu vi aldonis %s al via amikolisto?)"
 
 msgid "IM address"
 msgstr "Tujmesaĝila adreso"
@@ -3683,7 +3673,7 @@ msgstr "Servilo, kien direkti \"SSL\"-petojn"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
 msgid "Save paths"
-msgstr "Konservu lokigilon"
+msgstr "Konservi lokigilon"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -5981,87 +5971,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Hejmpaĝo"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Tempstrio de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Grupa profilo"
-
-msgid "Public"
-msgstr "Publika"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Serĉi homon ĉe la retejo"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMM-a agordo"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ŝanĝi vian profilan agordon."
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Uzanta agordo"
-
-#, fuzzy
-msgid "Logout"
-msgstr " Elsaluti"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Elsaluti el la retejo"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Ensaluti al la retejo"
-
-msgid "Search"
-msgstr "Serĉi"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Serĉi ĉe retejo"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Helpo"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Enkonduko"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Oftaj demandoj"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Serva Kondiĉo"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privateco"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fontkodo"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insigno"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6860,6 +6771,13 @@ msgstr "Al la instalilo."
 msgid "Database error"
 msgstr "Datumbaza eraro"
 
+#, fuzzy
+msgid "Home"
+msgstr "Hejmpaĝo"
+
+msgid "Public"
+msgstr "Publika"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Forigi la uzanton"
@@ -6874,7 +6792,7 @@ msgstr "Ŝanĝi kolorojn"
 
 #. TRANS: Button text on profile design page to immediately reset all colour settings to default.
 msgid "Use defaults"
-msgstr "Uzu defaŭlton"
+msgstr "Uzi defaŭlton"
 
 #. TRANS: Title for button on profile design page to reset all colour settings to default.
 msgid "Restore default designs"
@@ -6929,7 +6847,7 @@ msgstr "Maleble revoki aliradon al aplikaĵo: %s."
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
 #. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
-msgstr "Neŝati la avizon"
+msgstr "Forigi ŝatmarkon de ĉi tiu avizo"
 
 #. TRANS: Button text for removing the favourite status for a favourite notice.
 #, fuzzy
@@ -7535,6 +7453,18 @@ msgstr ""
 "Vi ne ricevis privatan mesaĝon. Vi povas sendi privatan mesaĝon al iu kaj "
 "interparoli kun ili. Homo sendas al vi mesaĝon al vi sole."
 
+msgid "Inbox"
+msgstr "Alvenkesto"
+
+msgid "Your incoming messages"
+msgstr "Viaj alvenaj mesaĝoj"
+
+msgid "Outbox"
+msgstr "Elirkesto"
+
+msgid "Your sent messages"
+msgstr "Viaj senditaj mesaĝoj"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "Malsukcesis ĝisdatigi uzanton"
@@ -7614,6 +7544,20 @@ msgstr "Mesaĝo"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vi ne rajtas forigi ĉi tiun grupon."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne forigi la avizon"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7728,24 +7672,16 @@ msgstr "Refoja avizo."
 msgid "Couldn't insert new subscription."
 msgstr "Eraris enmeti novan abonon."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Grupa profilo"
+
 msgid "Replies"
 msgstr "Respondoj"
 
 msgid "Favorites"
 msgstr "Ŝatolisto"
 
-msgid "Inbox"
-msgstr "Alvenkesto"
-
-msgid "Your incoming messages"
-msgstr "Viaj alvenaj mesaĝoj"
-
-msgid "Outbox"
-msgstr "Elirkesto"
-
-msgid "Your sent messages"
-msgstr "Viaj senditaj mesaĝoj"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7769,6 +7705,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMM-a agordo"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ŝanĝi vian profilan agordon."
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Uzanta agordo"
+
+#, fuzzy
+msgid "Logout"
+msgstr " Elsaluti"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Elsaluti el la retejo"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Ensaluti al la retejo"
+
+msgid "Search"
+msgstr "Serĉi"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Serĉi ĉe retejo"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7879,6 +7846,39 @@ msgstr "Serĉi enhavon ĉe la retejo"
 msgid "Find groups on this site"
 msgstr "Serĉi grupon ĉe la retejo"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Helpo"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Enkonduko"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Oftaj demandoj"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Serva Kondiĉo"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privateco"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fontkodo"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insigno"
+
 msgid "Untitled section"
 msgstr "Sentitola sekcio"
 
@@ -8162,19 +8162,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Priskribo estas tro longa (maksimume %d signoj)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Tro da alinomoj! Maksimume %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Tempstrio de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Enhavo"
+#~ msgid "Everyone on this site"
+#~ msgstr "Serĉi homon ĉe la retejo"
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index a9c0a7d99f..81bccda833 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -18,17 +18,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:15+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:08+0000\n"
 "Language-Team: Spanish <http://translatewiki.net/wiki/Portal:es>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6083,82 +6083,9 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Página de inicio"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "línea temporal de %s"
-
-msgid "Your profile"
-msgstr "Perfil del grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Encontrar gente en este sitio"
-
-msgid "Settings"
-msgstr "Configuración de SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambia tus opciones de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuración de usuario"
-
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-msgid "Logout from the site"
-msgstr "Cerrar sesión en el sitio"
-
-msgid "Login to the site"
-msgstr "Iniciar sesión en el sitio"
-
-msgid "Search"
-msgstr "Buscar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Buscar sitio"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ayuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntas Frecuentes"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidad"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fuente"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Ponerse en contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6965,6 +6892,12 @@ msgstr "Ir al instalador."
 msgid "Database error"
 msgstr "Error de la base de datos"
 
+msgid "Home"
+msgstr "Página de inicio"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Borrar este usuario"
@@ -7648,6 +7581,18 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
+msgid "Inbox"
+msgstr "Bandeja de Entrada"
+
+msgid "Your incoming messages"
+msgstr "Mensajes entrantes"
+
+msgid "Outbox"
+msgstr "Bandeja de Salida"
+
+msgid "Your sent messages"
+msgstr "Mensajes enviados"
+
 msgid "Could not parse message."
 msgstr "No se pudo analizar sintácticamente mensaje."
 
@@ -7728,6 +7673,20 @@ msgstr "Mensaje"
 msgid "from"
 msgstr "desde"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No puede eliminar este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No eliminar este usuario"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7842,24 +7801,15 @@ msgstr "Mensaje duplicado."
 msgid "Couldn't insert new subscription."
 msgstr "No se pudo insertar una nueva suscripción."
 
+msgid "Your profile"
+msgstr "Perfil del grupo"
+
 msgid "Replies"
 msgstr "Respuestas"
 
 msgid "Favorites"
 msgstr "Favoritos"
 
-msgid "Inbox"
-msgstr "Bandeja de Entrada"
-
-msgid "Your incoming messages"
-msgstr "Mensajes entrantes"
-
-msgid "Outbox"
-msgstr "Bandeja de Salida"
-
-msgid "Your sent messages"
-msgstr "Mensajes enviados"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7883,6 +7833,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configuración de SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambia tus opciones de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración de usuario"
+
+msgid "Logout"
+msgstr "Cerrar sesión"
+
+msgid "Logout from the site"
+msgstr "Cerrar sesión en el sitio"
+
+msgid "Login to the site"
+msgstr "Iniciar sesión en el sitio"
+
+msgid "Search"
+msgstr "Buscar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar sitio"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7992,6 +7969,39 @@ msgstr "Buscar en el contenido de mensajes"
 msgid "Find groups on this site"
 msgstr "Encontrar grupos en este sitio"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ayuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Acerca de"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntas Frecuentes"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidad"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fuente"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Ponerse en contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Sección sin título"
 
@@ -8277,19 +8287,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Tu nombre es demasiado largo (max. 255 carac.)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descripción es muy larga (máx. %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "La ubicación es demasiado larga (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "¡Muchos seudónimos! El máximo es %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "línea temporal de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenido"
+#~ msgid "Everyone on this site"
+#~ msgstr "Encontrar gente en este sitio"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index a103a57df9..d8bcba9d6d 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -7,6 +7,7 @@
 # Author: Everplays
 # Author: Mjbmr
 # Author: Narcissus
+# Author: Sahim
 # Author: ZxxZxxZ
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:17+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:10+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian <http://translatewiki.net/wiki/Portal:fa>\n"
 "MIME-Version: 1.0\n"
@@ -25,9 +26,9 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1712,9 +1713,8 @@ msgid "Do not delete this user."
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "حذف این کاربر"
+msgstr "این کاربر حذف شود."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -5023,9 +5023,8 @@ msgid "SMS phone number"
 msgstr "شمارهٔ تماس پیامک"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
-#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code."
-msgstr "شماره تلفن، بدون نشانه گذاری یا فاصله، با کد منطقه"
+msgstr "شماره تلفن، بدون نشانه‌گذاری یا فاصله‌گذاری، با کد منطقه."
 
 #. TRANS: Form legend for SMS preferences form.
 msgid "SMS preferences"
@@ -5368,9 +5367,8 @@ msgstr "مدیریت انتخاب های مختلف دیگر."
 msgid " (free service)"
 msgstr " (سرویس‌ آزاد)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "هیچ"
+msgstr "[هیچ]"
 
 msgid "[internal]"
 msgstr ""
@@ -6029,84 +6027,9 @@ msgstr "پاسخ"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "خانه"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "خط‌زمانی %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "نمایهٔ گروه"
-
-msgid "Public"
-msgstr "عمومی"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "پیدا کردن افراد در این وب‌گاه"
-
-#, fuzzy
-msgid "Settings"
-msgstr "تنظیمات پیامک"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "تنظیمات نمایه‌تان را تغییر دهید"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "پیکربندی کاربر"
-
-msgid "Logout"
-msgstr "خروج"
-
-msgid "Logout from the site"
-msgstr "خارج شدن از سایت ."
-
-msgid "Login to the site"
-msgstr "ورود به وب‌گاه"
-
-msgid "Search"
-msgstr "جست‌وجو"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "جست‌وجوی وب‌گاه"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "کمک"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "دربارهٔ"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "سوال‌های رایج"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "شرایط سرویس"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "خصوصی"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "منبع"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "تماس"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "نشان"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6224,9 +6147,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "پیدا کردن محتوای پیام‌ها"
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "چنین کاربری وجود ندارد."
+msgstr "چنین کاربری وجود ندارد %s."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -6901,6 +6824,12 @@ msgstr "برو به نصاب."
 msgid "Database error"
 msgstr "خطای پایگاه داده"
 
+msgid "Home"
+msgstr "خانه"
+
+msgid "Public"
+msgstr "عمومی"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "حذف این کاربر"
@@ -7574,6 +7503,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "صندوق دریافتی"
+
+msgid "Your incoming messages"
+msgstr "پیام های وارد شونده ی شما"
+
+msgid "Outbox"
+msgstr "صندوق خروجی"
+
+msgid "Your sent messages"
+msgstr "پیام‌های فرستاده شدهٔ شما"
+
 msgid "Could not parse message."
 msgstr "نمی‌توان پیام را تجزیه کرد."
 
@@ -7651,6 +7592,20 @@ msgstr "پیام"
 msgid "from"
 msgstr "از"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "شما یک عضو این گروه نیستید."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "این پیام را پاک نکن"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7765,24 +7720,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "نمی‌توان اشتراک تازه‌ای افزود."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "نمایهٔ گروه"
+
 msgid "Replies"
 msgstr "پاسخ ها"
 
 msgid "Favorites"
 msgstr "برگزیده‌ها"
 
-msgid "Inbox"
-msgstr "صندوق دریافتی"
-
-msgid "Your incoming messages"
-msgstr "پیام های وارد شونده ی شما"
-
-msgid "Outbox"
-msgstr "صندوق خروجی"
-
-msgid "Your sent messages"
-msgstr "پیام‌های فرستاده شدهٔ شما"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7806,6 +7753,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "تنظیمات پیامک"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "تنظیمات نمایه‌تان را تغییر دهید"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "پیکربندی کاربر"
+
+msgid "Logout"
+msgstr "خروج"
+
+msgid "Logout from the site"
+msgstr "خارج شدن از سایت ."
+
+msgid "Login to the site"
+msgstr "ورود به وب‌گاه"
+
+msgid "Search"
+msgstr "جست‌وجو"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "جست‌وجوی وب‌گاه"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7918,6 +7893,39 @@ msgstr "پیدا کردن محتوای پیام‌ها"
 msgid "Find groups on this site"
 msgstr "پیدا کردن گروه‌ها در این وب‌گاه"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "کمک"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "دربارهٔ"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "سوال‌های رایج"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "شرایط سرویس"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "خصوصی"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "منبع"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "تماس"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "نشان"
+
 msgid "Untitled section"
 msgstr "بخش بی‌نام"
 
@@ -8194,19 +8202,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "نام کامل خیلی طولانی است (حداکثر ۲۵۵ نویسه)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "توصیف خیلی طولانی است (حداکثر %d نویسه)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نویسه)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "خط‌زمانی %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "محتوا"
+#~ msgid "Everyone on this site"
+#~ msgstr "پیدا کردن افراد در این وب‌گاه"
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 63c5dffdf9..31e3ddcf16 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -15,17 +15,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:18+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:11+0000\n"
 "Language-Team: Finnish <http://translatewiki.net/wiki/Portal:fi>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6011,83 +6011,9 @@ msgstr "Vastaus"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Kotisivu"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s aikajana"
-
-msgid "Your profile"
-msgstr "Sinun profiilisi"
-
-msgid "Public"
-msgstr "Julkinen"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Hae ihmisiä tältä sivustolta"
-
-msgid "Settings"
-msgstr "Profiilikuva-asetukset"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Vaihda profiiliasetuksesi"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "SMS vahvistus"
-
-msgid "Logout"
-msgstr "Kirjaudu ulos"
-
-msgid "Logout from the site"
-msgstr "Kirjaudu sisään"
-
-msgid "Login to the site"
-msgstr "Kirjaudu sisään"
-
-msgid "Search"
-msgstr "Haku"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Haku"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ohjeet"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Tietoa"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "UKK"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Yksityisyys"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Lähdekoodi"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Ota yhteyttä"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Tönäise"
+msgid "Status"
+msgstr "Päivitys poistettu."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6870,6 +6796,12 @@ msgstr "Kirjaudu sisään palveluun"
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
+msgid "Home"
+msgstr "Kotisivu"
+
+msgid "Public"
+msgstr "Julkinen"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Poista käyttäjä"
@@ -7472,6 +7404,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Saapuneet"
+
+msgid "Your incoming messages"
+msgstr "Sinulle saapuneet viestit"
+
+msgid "Outbox"
+msgstr "Lähetetyt"
+
+msgid "Your sent messages"
+msgstr "Lähettämäsi viestit"
+
 msgid "Could not parse message."
 msgstr "Ei voitu lukea viestiä."
 
@@ -7549,6 +7493,20 @@ msgstr "Viesti"
 msgid "from"
 msgstr " lähteestä "
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Sinä et kuulu tähän ryhmään."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Älä poista tätä päivitystä"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7666,24 +7624,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
 
+msgid "Your profile"
+msgstr "Sinun profiilisi"
+
 msgid "Replies"
 msgstr "Vastaukset"
 
 msgid "Favorites"
 msgstr "Suosikit"
 
-msgid "Inbox"
-msgstr "Saapuneet"
-
-msgid "Your incoming messages"
-msgstr "Sinulle saapuneet viestit"
-
-msgid "Outbox"
-msgstr "Lähetetyt"
-
-msgid "Your sent messages"
-msgstr "Lähettämäsi viestit"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7708,6 +7657,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Profiilikuva-asetukset"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Vaihda profiiliasetuksesi"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS vahvistus"
+
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+msgid "Logout from the site"
+msgstr "Kirjaudu sisään"
+
+msgid "Login to the site"
+msgstr "Kirjaudu sisään"
+
+msgid "Search"
+msgstr "Haku"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Haku"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7824,6 +7800,40 @@ msgstr "Hae päivityksien sisällöstä"
 msgid "Find groups on this site"
 msgstr "Etsi ryhmiä tästä palvelusta"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ohjeet"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Tietoa"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "UKK"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Yksityisyys"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Lähdekoodi"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Ota yhteyttä"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Tönäise"
+
 msgid "Untitled section"
 msgstr "Nimetön osa"
 
@@ -8114,19 +8124,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "kuvaus on liian pitkä (max %d merkkiä)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Kotipaikka on liian pitkä (enintään 255 merkkiä)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Liikaa aliaksia. Maksimimäärä on %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s aikajana"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Sisältö"
+#~ msgid "Everyone on this site"
+#~ msgstr "Hae ihmisiä tältä sivustolta"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 825c092aca..4006bd8157 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -21,17 +21,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:19+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:12+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6095,82 +6095,9 @@ msgstr "Répondre"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Site personnel"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Activité de %s"
-
-msgid "Your profile"
-msgstr "Votre profil"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Chercher des personnes sur ce site"
-
-msgid "Settings"
-msgstr "Paramètres SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modifier vos paramètres de profil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuration utilisateur"
-
-msgid "Logout"
-msgstr "Déconnexion"
-
-msgid "Logout from the site"
-msgstr "Fermer la session"
-
-msgid "Login to the site"
-msgstr "Ouvrir une session"
-
-msgid "Search"
-msgstr "Rechercher"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Rechercher sur le site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Aide"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "À propos"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "CGU"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Confidentialité"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Source"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insigne"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6981,6 +6908,12 @@ msgstr "Aller au programme d’installation"
 msgid "Database error"
 msgstr "Erreur de la base de données"
 
+msgid "Home"
+msgstr "Site personnel"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
@@ -7664,6 +7597,18 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+msgid "Your incoming messages"
+msgstr "Vos messages reçus"
+
+msgid "Outbox"
+msgstr "Boîte d’envoi"
+
+msgid "Your sent messages"
+msgstr "Vos messages envoyés"
+
 msgid "Could not parse message."
 msgstr "Impossible de déchiffrer ce message."
 
@@ -7742,6 +7687,20 @@ msgstr "Message"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vous n’êtes pas autorisé à supprimer ce groupe."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne pas supprimer ce groupe"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonyme ne peut pas être vide."
@@ -7856,24 +7815,15 @@ msgstr "Avis en doublon."
 msgid "Couldn't insert new subscription."
 msgstr "Impossible d’insérer un nouvel abonnement."
 
+msgid "Your profile"
+msgstr "Votre profil"
+
 msgid "Replies"
 msgstr "Réponses"
 
 msgid "Favorites"
 msgstr "Favoris"
 
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-msgid "Your incoming messages"
-msgstr "Vos messages reçus"
-
-msgid "Outbox"
-msgstr "Boîte d’envoi"
-
-msgid "Your sent messages"
-msgstr "Vos messages envoyés"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7897,6 +7847,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Paramètres SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifier vos paramètres de profil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuration utilisateur"
+
+msgid "Logout"
+msgstr "Déconnexion"
+
+msgid "Logout from the site"
+msgstr "Fermer la session"
+
+msgid "Login to the site"
+msgstr "Ouvrir une session"
+
+msgid "Search"
+msgstr "Rechercher"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Rechercher sur le site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -8005,6 +7982,39 @@ msgstr "Chercher dans le contenu des avis"
 msgid "Find groups on this site"
 msgstr "Rechercher des groupes sur ce site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Aide"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "À propos"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "CGU"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Confidentialité"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Source"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insigne"
+
 msgid "Untitled section"
 msgstr "Section sans titre"
 
@@ -8292,19 +8302,10 @@ msgstr "XML invalide, racine XRD manquante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtention de la sauvegarde depuis le fichier « %s »."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Le nom complet est trop long (limité à 255 caractères maximum)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "la description est trop longue (%d caractères maximum)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "L’emplacement est trop long (limité à 255 caractères maximum)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Trop d’alias ! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Activité de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenu"
+#~ msgid "Everyone on this site"
+#~ msgstr "Chercher des personnes sur ce site"
diff --git a/locale/fur/LC_MESSAGES/statusnet.po b/locale/fur/LC_MESSAGES/statusnet.po
index feef13b8d9..8935ca9b3a 100644
--- a/locale/fur/LC_MESSAGES/statusnet.po
+++ b/locale/fur/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:20+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:13+0000\n"
 "Language-Team: Friulian <http://translatewiki.net/wiki/Portal:fur>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fur\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5693,88 +5693,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Pagjine web"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Ativitât di %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Profîl dal grup"
-
-msgid "Public"
-msgstr "Public"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Cjate int in chest sît"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Impuestazions IM"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambie lis impuestazions dal to profîl"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Cambie la configurazion dal sît"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Jes"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Jes dal sît"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Jentre tal sît"
-
-#, fuzzy
-msgid "Search"
-msgstr "Cîr"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cîr tal sît"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Jutori"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Informazions"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Sorzint"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contats"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6524,6 +6444,13 @@ msgstr ""
 msgid "Database error"
 msgstr "Erôr de base di dâts"
 
+#, fuzzy
+msgid "Home"
+msgstr "Pagjine web"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimine chest utent"
@@ -7090,6 +7017,19 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr ""
+
+msgid "Your incoming messages"
+msgstr ""
+
+#, fuzzy
+msgid "Outbox"
+msgstr "Pueste in jessude par %s"
+
+msgid "Your sent messages"
+msgstr ""
+
 msgid "Could not parse message."
 msgstr ""
 
@@ -7163,6 +7103,20 @@ msgstr "Messaçs"
 msgid "from"
 msgstr "di"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "No tu fasis part di chest grup."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "No stâ eliminâ chest utent"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7275,6 +7229,10 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Profîl dal grup"
+
 #, fuzzy
 msgid "Replies"
 msgstr "Rispuestis"
@@ -7283,19 +7241,6 @@ msgstr "Rispuestis"
 msgid "Favorites"
 msgstr "Preferîts"
 
-msgid "Inbox"
-msgstr ""
-
-msgid "Your incoming messages"
-msgstr ""
-
-#, fuzzy
-msgid "Outbox"
-msgstr "Pueste in jessude par %s"
-
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7319,6 +7264,38 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "Impuestazions IM"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie lis impuestazions dal to profîl"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Cambie la configurazion dal sît"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Jes"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Jes dal sît"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Jentre tal sît"
+
+#, fuzzy
+msgid "Search"
+msgstr "Cîr"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Cîr tal sît"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7427,6 +7404,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Jutori"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Informazions"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Sorzint"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contats"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr ""
 
@@ -7705,18 +7715,9 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Il non complet al è masse lunc (max 255 caratars)."
+#~ msgid "Friends timeline"
+#~ msgstr "Ativitât di %s"
 
 #, fuzzy
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descrizion e je masse lungje (massim %d caratar)."
-
-#, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Il lûc al è masse lunc (max 255 caratars)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contignût"
+#~ msgid "Everyone on this site"
+#~ msgstr "Cjate int in chest sît"
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 0f2762b236..82a1934778 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:21+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:14+0000\n"
 "Language-Team: Galician <http://translatewiki.net/wiki/Portal:gl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -272,7 +272,7 @@ msgstr "Non se puido gardar o perfil."
 #. TRANS: Client error displayed when the number of bytes in a POST request exceeds a limit.
 #. TRANS: %s is the number of bytes of the CONTENT_LENGTH.
 #. TRANS: Form validation error in design settings form. POST should remain untranslated.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "The server was unable to handle that much POST data (%s byte) due to its "
 "current configuration."
@@ -302,7 +302,7 @@ msgstr "Non se puido actualizar o seu deseño."
 #. TRANS: Title for Atom feed.
 msgctxt "ATOM"
 msgid "Main"
-msgstr ""
+msgstr "Principal"
 
 #. TRANS: Title for Atom feed. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -324,12 +324,12 @@ msgstr "%s subscricións"
 #. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
 #. TRANS: Title for Atom favorites feed.
 #. TRANS: %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s favorites"
-msgstr "Favoritas"
+msgstr "Favoritos de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
@@ -373,7 +373,7 @@ msgstr "A mensaxe non ten texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] ""
@@ -386,13 +386,11 @@ msgid "Recipient user not found."
 msgstr "Non se atopou o destinatario."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Non pode enviar mensaxes directas a usuarios que non sexan amigos seus."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -441,7 +439,6 @@ msgid "You cannot unfollow yourself."
 msgstr "Non pode deixar de seguirse a si mesmo."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Deben fornecerse dúas identificacións ou nomes de usuario."
 
@@ -484,7 +481,6 @@ msgstr "O URL da páxina persoal non é correcto."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 
@@ -499,7 +495,7 @@ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "A descrición é longa de máis (o máximo son %d caracteres)."
@@ -510,7 +506,6 @@ msgstr[1] "A descrición é longa de máis (o máximo son %d caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 
@@ -522,7 +517,7 @@ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Demasiados pseudónimos! O número máximo é %d."
@@ -641,7 +636,6 @@ msgstr ""
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "O pseudónimo non pode coincidir co alcume."
 
@@ -650,7 +644,6 @@ msgid "Upload failed."
 msgstr "Houbo un erro durante a carga."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "O pase especificado é incorrecto."
 
@@ -663,9 +656,8 @@ msgid "Invalid request token."
 msgstr "Pase de solicitude incorrecto."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
-msgstr "Non está autorizado."
+msgstr "O pase solicitado xa está autorizado."
 
 #. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
 #. TRANS: Client error displayed when the session token does not match or is not given.
@@ -681,11 +673,9 @@ msgid "Invalid nickname / password!"
 msgstr "O alcume ou o contrasinal son incorrectos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr ""
-"Houbo un erro na base de datos ao intentar inserir o usuario da aplicación "
-"OAuth."
+"Houbo un erro na base de datos ao intentar inserir o oauth_token_association."
 
 #. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
 #. TRANS: Unexpected validation error on avatar upload form.
@@ -861,14 +851,13 @@ msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Non se pode borrar esta nota."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Borrar a nota"
+msgstr "Borrar a nota %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -1675,9 +1664,8 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Está seguro de querer borrar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Non borrar esta nota"
+msgstr "Non borrar esta nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #, fuzzy
@@ -4740,7 +4728,6 @@ msgid "Created"
 msgstr "Creado"
 
 #. TRANS: Label for member count in statistics on group page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -6091,87 +6078,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Páxina persoal"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "Liña do tempo de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Públicas"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Atopar xente neste sitio"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Configuración dos SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Cambie a configuración do seu perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuración do usuario"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Saír"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Saír ao anonimato"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Identificarse no sitio"
-
-msgid "Search"
-msgstr "Buscar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Buscar no sitio"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Axuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Acerca de"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Preguntas máis frecuentes"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Condicións do servicio"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Protección de datos"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Código fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6983,6 +6891,13 @@ msgstr "Ir ao instalador."
 msgid "Database error"
 msgstr "Houbo un erro na base de datos"
 
+#, fuzzy
+msgid "Home"
+msgstr "Páxina persoal"
+
+msgid "Public"
+msgstr "Públicas"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Borrar o usuario"
@@ -7668,6 +7583,18 @@ msgstr ""
 "Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
 "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
 
+msgid "Inbox"
+msgstr "Caixa de entrada"
+
+msgid "Your incoming messages"
+msgstr "As mensaxes recibidas"
+
+msgid "Outbox"
+msgstr "Caixa de saída"
+
+msgid "Your sent messages"
+msgstr "As mensaxes enviadas"
+
 msgid "Could not parse message."
 msgstr "Non se puido analizar a mensaxe."
 
@@ -7747,6 +7674,20 @@ msgstr "Mensaxe"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Vostede non pertence a este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non borrar esta nota"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7861,24 +7802,16 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir unha subscrición nova."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritas"
 
-msgid "Inbox"
-msgstr "Caixa de entrada"
-
-msgid "Your incoming messages"
-msgstr "As mensaxes recibidas"
-
-msgid "Outbox"
-msgstr "Caixa de saída"
-
-msgid "Your sent messages"
-msgstr "As mensaxes enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7902,6 +7835,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "Configuración dos SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Cambie a configuración do seu perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuración do usuario"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Saír"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Saír ao anonimato"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Identificarse no sitio"
+
+msgid "Search"
+msgstr "Buscar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Buscar no sitio"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -8011,6 +7975,39 @@ msgstr "Buscar nos contidos das notas"
 msgid "Find groups on this site"
 msgstr "Buscar grupos neste sitio"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Axuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Acerca de"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Preguntas máis frecuentes"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Condicións do servicio"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Protección de datos"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Código fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Sección sen título"
 
@@ -8298,19 +8295,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "O nome completo é longo de máis (o máximo son 255 caracteres)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "a descrición é longa de máis (o límite é de %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "A localidade é longa de máis (o máximo son 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados pseudónimos! O número máximo é %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Liña do tempo de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contido"
+#~ msgid "Everyone on this site"
+#~ msgstr "Atopar xente neste sitio"
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index da7a95e7ed..a5b1dc4d09 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -11,18 +11,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:22+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:15+0000\n"
 "Language-Team: Upper Sorbian <http://translatewiki.net/wiki/Portal:hsb>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : (n%100==3 || "
 "n%100==4) ? 2 : 3)\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5694,86 +5694,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "Startowa strona"
-
-msgid "Friends timeline"
-msgstr ""
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Skupinski profil"
-
-msgid "Public"
-msgstr "Zjawny"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Ludźi na tutym sydle pytać"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS-nastajenja"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Twoje profilowe nastajenja změnić"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Wužiwarska konfiguracija"
-
-#, fuzzy
-msgid "Logout"
-msgstr "Wotzjewić"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Ze sydła wotzjewić"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Při sydle přizjewić"
-
-msgid "Search"
-msgstr "Pytać"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Pytanske sydło"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Wo"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Huste prašenja"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Wužiwarske wuměnjenja"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Priwatnosć"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Žórło"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Plaketa"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6533,6 +6455,13 @@ msgstr "K instalaciji"
 msgid "Database error"
 msgstr "Zmylk w datowej bance"
 
+#, fuzzy
+msgid "Home"
+msgstr "Startowa strona"
+
+msgid "Public"
+msgstr "Zjawny"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Tutoho wužiwarja wušmórnyć"
@@ -7122,6 +7051,18 @@ msgstr ""
 "wužiwarjow do konwersacije zaplesć. Ludźo móža ći powěsće pósłać, kotrež "
 "jenož ty móžeš widźeć."
 
+msgid "Inbox"
+msgstr "Dochadny póst"
+
+msgid "Your incoming messages"
+msgstr "Twoje dochadźace powěsće"
+
+msgid "Outbox"
+msgstr "Wuchadny póst"
+
+msgid "Your sent messages"
+msgstr "Twoje pósłane powěsće"
+
 msgid "Could not parse message."
 msgstr "Powěsć njeda so analyzować."
 
@@ -7199,6 +7140,20 @@ msgstr "Powěsće"
 msgid "from"
 msgstr "wot"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Njesměš tutu skupinu zhašeć."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Tutoho wužiwarja njezhašeć."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Přimjeno njemóže prózdne być."
@@ -7313,24 +7268,16 @@ msgstr "Dwójna zdźělenka."
 msgid "Couldn't insert new subscription."
 msgstr "Nowy abonement njeda so zasunyć."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Skupinski profil"
+
 msgid "Replies"
 msgstr "Wotmołwy"
 
 msgid "Favorites"
 msgstr "Fawority"
 
-msgid "Inbox"
-msgstr "Dochadny póst"
-
-msgid "Your incoming messages"
-msgstr "Twoje dochadźace powěsće"
-
-msgid "Outbox"
-msgstr "Wuchadny póst"
-
-msgid "Your sent messages"
-msgstr "Twoje pósłane powěsće"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7354,6 +7301,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-nastajenja"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Twoje profilowe nastajenja změnić"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Wužiwarska konfiguracija"
+
+#, fuzzy
+msgid "Logout"
+msgstr "Wotzjewić"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Ze sydła wotzjewić"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Při sydle přizjewić"
+
+msgid "Search"
+msgstr "Pytać"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Pytanske sydło"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7462,6 +7440,39 @@ msgstr "Wobsah zdźělenkow přepytać"
 msgid "Find groups on this site"
 msgstr "Skupiny na tutym sydle pytać"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Pomoc"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Wo"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Huste prašenja"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Wužiwarske wuměnjenja"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Priwatnosć"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Žórło"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Plaketa"
+
 msgid "Untitled section"
 msgstr "Wotrězk bjez titula"
 
@@ -7751,19 +7762,6 @@ msgstr "Njepłaćiwy XML, korjeń XRD faluje."
 msgid "Getting backup from file '%s'."
 msgstr "Wobstaruje so zawěsćenje z dataje \"%s\"-"
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Dospołne mjeno je předołho (maks. 255 znamješkow)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "wopisanje je předołho (maks. %d znamješkow)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Městno je předołho (maks. 255 znamješkow)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Přewjele aliasow! Maksimum: %d."
-
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Wobsah"
+#~ msgid "Everyone on this site"
+#~ msgstr "Ludźi na tutym sydle pytać"
diff --git a/locale/hu/LC_MESSAGES/statusnet.po b/locale/hu/LC_MESSAGES/statusnet.po
index c52526e5b3..fa3776bd12 100644
--- a/locale/hu/LC_MESSAGES/statusnet.po
+++ b/locale/hu/LC_MESSAGES/statusnet.po
@@ -12,13 +12,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:23+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:16+0000\n"
 "Language-Team: Hungarian <http://translatewiki.net/wiki/Portal:hu>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hu\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5841,84 +5841,9 @@ msgstr "Válasz"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Otthon"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s története"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Csoportprofil"
-
-msgid "Public"
-msgstr ""
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Emberek keresése az oldalon"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS beállítások"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Változtasd meg a jelszavad"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "A felhasználók beállításai"
-
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-msgid "Logout from the site"
-msgstr "Kijelentkezés a webhelyről"
-
-msgid "Login to the site"
-msgstr "Bejelentkezés a webhelyre"
-
-msgid "Search"
-msgstr "Keresés"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "A webhely témája."
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Súgó"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Névjegy"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "GyIK"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Felhasználási feltételek"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Forrás"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6664,6 +6589,12 @@ msgstr "Menj a telepítőhöz."
 msgid "Database error"
 msgstr "Adatbázishiba"
 
+msgid "Home"
+msgstr "Otthon"
+
+msgid "Public"
+msgstr ""
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Töröljük ezt a felhasználót"
@@ -7308,6 +7239,20 @@ msgstr ""
 "keveredj más felhasználókkal. Olyan üzenetet küldhetnek neked emberek, amit "
 "csak te láthatsz."
 
+#, fuzzy
+msgid "Inbox"
+msgstr "Homokozó"
+
+msgid "Your incoming messages"
+msgstr "A bejövő üzeneteid"
+
+#, fuzzy
+msgid "Outbox"
+msgstr "%s kimenő postafiókja"
+
+msgid "Your sent messages"
+msgstr "A küldött üzeneteid"
+
 msgid "Could not parse message."
 msgstr "Nem sikerült az üzenetet feldolgozni."
 
@@ -7384,6 +7329,20 @@ msgstr "Üzenet"
 msgid "from"
 msgstr "írta"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Nem vagy tagja ennek a csoportnak."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ne töröljük ezt a hírt"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7496,26 +7455,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Csoportprofil"
+
 msgid "Replies"
 msgstr "Válaszok"
 
 msgid "Favorites"
 msgstr "Kedvencek"
 
-#, fuzzy
-msgid "Inbox"
-msgstr "Homokozó"
-
-msgid "Your incoming messages"
-msgstr "A bejövő üzeneteid"
-
-#, fuzzy
-msgid "Outbox"
-msgstr "%s kimenő postafiókja"
-
-msgid "Your sent messages"
-msgstr "A küldött üzeneteid"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7539,6 +7488,34 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS beállítások"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Változtasd meg a jelszavad"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "A felhasználók beállításai"
+
+msgid "Logout"
+msgstr "Kijelentkezés"
+
+msgid "Logout from the site"
+msgstr "Kijelentkezés a webhelyről"
+
+msgid "Login to the site"
+msgstr "Bejelentkezés a webhelyre"
+
+msgid "Search"
+msgstr "Keresés"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "A webhely témája."
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7648,6 +7625,39 @@ msgstr "Keressünk a hírek tartalmában"
 msgid "Find groups on this site"
 msgstr "Csoportok keresése az oldalon"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Súgó"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Névjegy"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "GyIK"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Felhasználási feltételek"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Forrás"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kapcsolat"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr "Névtelen szakasz"
 
@@ -7927,19 +7937,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "A teljes név túl hosszú (legfeljebb 255 karakter lehet)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "a leírás túl hosszú (legfeljebb %d karakter)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "A hely túl hosszú (legfeljebb 255 karakter lehet)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Túl sok álnév! Legfeljebb %d lehet."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s története"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Tartalom"
+#~ msgid "Everyone on this site"
+#~ msgstr "Emberek keresése az oldalon"
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 41dc0c2520..fce258aa37 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:24+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:17+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2928,9 +2928,8 @@ msgid "Type"
 msgstr "Typo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Selige licentia"
+msgstr "Selige un licentia."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -2969,9 +2968,8 @@ msgid "URL for an image to display with the license."
 msgstr "Le URL de un imagine a monstrar con le licentia."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Salveguardar configurationes de licentia"
+msgstr "Salveguardar configurationes de licentia."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3007,7 +3005,6 @@ msgstr ""
 "commun!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aperir session"
@@ -3103,7 +3100,6 @@ msgstr "Nove message"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
@@ -5915,86 +5911,17 @@ msgid "Show more"
 msgstr "Monstrar plus"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Scriber un responsa..."
 
-msgid "Home"
-msgstr "Initio"
-
-msgid "Friends timeline"
-msgstr "Chronologia de amicos"
-
-msgid "Your profile"
-msgstr "Tu profilo"
-
-msgid "Public"
-msgstr "Public"
-
-msgid "Everyone on this site"
-msgstr "Omnes in iste sito"
-
-msgid "Settings"
-msgstr "Configurationes"
-
-msgid "Change your personal settings"
-msgstr "Cambiar tu optiones personal"
-
-msgid "Site configuration"
-msgstr "Configuration del sito"
-
-msgid "Logout"
-msgstr "Clauder session"
-
-msgid "Logout from the site"
-msgstr "Terminar le session del sito"
-
-msgid "Login to the site"
-msgstr "Authenticar te a iste sito"
-
-msgid "Search"
-msgstr "Cercar"
-
-msgid "Search the site"
-msgstr "Cercar in le sito"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Adjuta"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "A proposito"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "CdS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Confidentialitate"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Insignia"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6788,6 +6715,12 @@ msgstr "Ir al installator."
 msgid "Database error"
 msgstr "Error de base de datos"
 
+msgid "Home"
+msgstr "Initio"
+
+msgid "Public"
+msgstr "Public"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Deler iste usator"
@@ -7463,6 +7396,18 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
+msgid "Inbox"
+msgstr "Cassa de entrata"
+
+msgid "Your incoming messages"
+msgstr "Tu messages recipite"
+
+msgid "Outbox"
+msgstr "Cassa de exito"
+
+msgid "Your sent messages"
+msgstr "Tu messages inviate"
+
 msgid "Could not parse message."
 msgstr "Non comprendeva le syntaxe del message."
 
@@ -7540,6 +7485,20 @@ msgstr "Messages"
 msgid "from"
 msgstr "via"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Tu non ha le permission de deler iste gruppo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non deler iste usator."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Le pseudonymo non pote esser vacue."
@@ -7565,9 +7524,8 @@ msgid "Attach"
 msgstr "Annexar"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Annexar un file"
+msgstr "Annexar un file."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7654,24 +7612,15 @@ msgstr "Nota duplicate."
 msgid "Couldn't insert new subscription."
 msgstr "Non poteva inserer nove subscription."
 
+msgid "Your profile"
+msgstr "Tu profilo"
+
 msgid "Replies"
 msgstr "Responsas"
 
 msgid "Favorites"
 msgstr "Favorites"
 
-msgid "Inbox"
-msgstr "Cassa de entrata"
-
-msgid "Your incoming messages"
-msgstr "Tu messages recipite"
-
-msgid "Outbox"
-msgstr "Cassa de exito"
-
-msgid "Your sent messages"
-msgstr "Tu messages inviate"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7695,6 +7644,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "(Le descriptiones de plug-ins non es disponibile si disactivate.)"
 
+msgid "Settings"
+msgstr "Configurationes"
+
+msgid "Change your personal settings"
+msgstr "Cambiar tu optiones personal"
+
+msgid "Site configuration"
+msgstr "Configuration del sito"
+
+msgid "Logout"
+msgstr "Clauder session"
+
+msgid "Logout from the site"
+msgstr "Terminar le session del sito"
+
+msgid "Login to the site"
+msgstr "Authenticar te a iste sito"
+
+msgid "Search"
+msgstr "Cercar"
+
+msgid "Search the site"
+msgstr "Cercar in le sito"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7803,6 +7776,39 @@ msgstr "Cercar in contento de notas"
 msgid "Find groups on this site"
 msgstr "Cercar gruppos in iste sito"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Adjuta"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "A proposito"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "CdS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Confidentialitate"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Insignia"
+
 msgid "Untitled section"
 msgstr "Section sin titulo"
 
@@ -7930,11 +7936,11 @@ msgstr ""
 msgid "Error opening theme archive."
 msgstr "Error durante le apertura del archivo del apparentia."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Monstrar plus"
-msgstr[1] "Monstrar plus"
+msgstr[0] "Monstrar %d responsa"
+msgstr[1] "Monstrar tote le %d responsas"
 
 msgid "Top posters"
 msgstr "Qui scribe le plus"
@@ -8088,26 +8094,8 @@ msgstr "XML invalide, radice XRD mancante."
 msgid "Getting backup from file '%s'."
 msgstr "Obtene copia de reserva ex file '%s'."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Le nomine complete es troppo longe (max. 255 characteres)."
+#~ msgid "Friends timeline"
+#~ msgstr "Chronologia de amicos"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "description es troppo longe (max %d chars)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Loco es troppo longe (max. 255 characteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppo de aliases! Maximo: %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Commento"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Adder un commento..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Monstrar %d commento"
-#~ msgstr[1] "Monstrar tote le %d commentos"
+#~ msgid "Everyone on this site"
+#~ msgstr "Omnes in iste sito"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index efc7abd4ee..472a3eb844 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:25+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:18+0000\n"
 "Language-Team: Italian <http://translatewiki.net/wiki/Portal:it>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6073,83 +6073,9 @@ msgstr "Rispondi"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Pagina web"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Attività di %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Profilo del gruppo"
-
-msgid "Public"
-msgstr "Pubblico"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Trova persone in questo sito"
-
-msgid "Settings"
-msgstr "Impostazioni SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modifica le impostazioni del tuo profilo"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configurazione utente"
-
-msgid "Logout"
-msgstr "Esci"
-
-msgid "Logout from the site"
-msgstr "Termina la tua sessione sul sito"
-
-msgid "Login to the site"
-msgstr "Accedi al sito"
-
-msgid "Search"
-msgstr "Cerca"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Cerca nel sito"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Aiuto"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Informazioni"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Sorgenti"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contatti"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Badge"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6956,6 +6882,12 @@ msgstr "Vai al programma d'installazione."
 msgid "Database error"
 msgstr "Errore del database"
 
+msgid "Home"
+msgstr "Pagina web"
+
+msgid "Public"
+msgstr "Pubblico"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Elimina questo utente"
@@ -7637,6 +7569,18 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
+msgid "Inbox"
+msgstr "In arrivo"
+
+msgid "Your incoming messages"
+msgstr "I tuoi messaggi in arrivo"
+
+msgid "Outbox"
+msgstr "Inviati"
+
+msgid "Your sent messages"
+msgstr "I tuoi messaggi inviati"
+
 msgid "Could not parse message."
 msgstr "Impossibile analizzare il messaggio."
 
@@ -7716,6 +7660,20 @@ msgstr "Messaggio"
 msgid "from"
 msgstr "via"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Non fai parte di questo gruppo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Non eliminare il messaggio"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7830,24 +7788,16 @@ msgstr "Messaggio duplicato."
 msgid "Couldn't insert new subscription."
 msgstr "Impossibile inserire un nuovo abbonamento."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Profilo del gruppo"
+
 msgid "Replies"
 msgstr "Risposte"
 
 msgid "Favorites"
 msgstr "Preferiti"
 
-msgid "Inbox"
-msgstr "In arrivo"
-
-msgid "Your incoming messages"
-msgstr "I tuoi messaggi in arrivo"
-
-msgid "Outbox"
-msgstr "Inviati"
-
-msgid "Your sent messages"
-msgstr "I tuoi messaggi inviati"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7871,6 +7821,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Impostazioni SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modifica le impostazioni del tuo profilo"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configurazione utente"
+
+msgid "Logout"
+msgstr "Esci"
+
+msgid "Logout from the site"
+msgstr "Termina la tua sessione sul sito"
+
+msgid "Login to the site"
+msgstr "Accedi al sito"
+
+msgid "Search"
+msgstr "Cerca"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Cerca nel sito"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7980,6 +7957,39 @@ msgstr "Trova contenuto dei messaggi"
 msgid "Find groups on this site"
 msgstr "Trova gruppi in questo sito"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Aiuto"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Informazioni"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Sorgenti"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contatti"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Badge"
+
 msgid "Untitled section"
 msgstr "Sezione senza nome"
 
@@ -8265,19 +8275,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome troppo lungo (max 255 caratteri)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "La descrizione è troppo lunga (max %d caratteri)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Ubicazione troppo lunga (max 255 caratteri)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Troppi alias! Massimo %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Attività di %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Contenuto"
+#~ msgid "Everyone on this site"
+#~ msgstr "Trova persone in questo sito"
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 859ac92bf3..3eec1131ea 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -14,17 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:26+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:19+0000\n"
 "Language-Team: Japanese <http://translatewiki.net/wiki/Portal:ja>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6061,82 +6061,9 @@ msgstr "返信"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "ホームページ"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s のタイムライン"
-
-msgid "Your profile"
-msgstr "グループプロファイル"
-
-msgid "Public"
-msgstr "パブリック"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "このサイトの人々を探す"
-
-msgid "Settings"
-msgstr "SMS 設定"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "プロファイル設定の変更"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ユーザ設定"
-
-msgid "Logout"
-msgstr "ロゴ"
-
-msgid "Logout from the site"
-msgstr "サイトのテーマ"
-
-msgid "Login to the site"
-msgstr "サイトへログイン"
-
-msgid "Search"
-msgstr "検索"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "サイト検索"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "ヘルプ"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "About"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "よくある質問"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "プライバシー"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "ソース"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "連絡先"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "バッジ"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6900,6 +6827,12 @@ msgstr "インストーラへ。"
 msgid "Database error"
 msgstr "データベースエラー"
 
+msgid "Home"
+msgstr "ホームページ"
+
+msgid "Public"
+msgstr "パブリック"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "このユーザを削除"
@@ -7546,6 +7479,18 @@ msgstr ""
 "に引き込むプライベートメッセージを送ることができます。人々はあなただけへの"
 "メッセージを送ることができます。"
 
+msgid "Inbox"
+msgstr "受信箱"
+
+msgid "Your incoming messages"
+msgstr "あなたの入ってくるメッセージ"
+
+msgid "Outbox"
+msgstr "送信箱"
+
+msgid "Your sent messages"
+msgstr "あなたが送ったメッセージ"
+
 msgid "Could not parse message."
 msgstr "メッセージを分析できませんでした。"
 
@@ -7625,6 +7570,20 @@ msgstr "メッセージ"
 msgid "from"
 msgstr "from"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "このグループのメンバーではありません。"
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "このつぶやきを削除できません。"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7742,24 +7701,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "サブスクリプションを追加できません"
 
+msgid "Your profile"
+msgstr "グループプロファイル"
+
 msgid "Replies"
 msgstr "返信"
 
 msgid "Favorites"
 msgstr "お気に入り"
 
-msgid "Inbox"
-msgstr "受信箱"
-
-msgid "Your incoming messages"
-msgstr "あなたの入ってくるメッセージ"
-
-msgid "Outbox"
-msgstr "送信箱"
-
-msgid "Your sent messages"
-msgstr "あなたが送ったメッセージ"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7783,6 +7733,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS 設定"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "プロファイル設定の変更"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ユーザ設定"
+
+msgid "Logout"
+msgstr "ロゴ"
+
+msgid "Logout from the site"
+msgstr "サイトのテーマ"
+
+msgid "Login to the site"
+msgstr "サイトへログイン"
+
+msgid "Search"
+msgstr "検索"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "サイト検索"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7892,6 +7869,39 @@ msgstr "つぶやきの内容を探す"
 msgid "Find groups on this site"
 msgstr "このサイト上のグループを検索する"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "ヘルプ"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "About"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "よくある質問"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "プライバシー"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "ソース"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "連絡先"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "バッジ"
+
 msgid "Untitled section"
 msgstr "名称未設定のセクション"
 
@@ -8170,19 +8180,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "フルネームが長すぎます。（255字まで）"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "記述が長すぎます。（最長 %d 字）"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "場所が長すぎます。（255字まで）"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "別名が多すぎます! 最大 %d。"
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s のタイムライン"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "内容"
+#~ msgid "Everyone on this site"
+#~ msgstr "このサイトの人々を探す"
diff --git a/locale/ka/LC_MESSAGES/statusnet.po b/locale/ka/LC_MESSAGES/statusnet.po
index 67e579623d..2ee236d8e5 100644
--- a/locale/ka/LC_MESSAGES/statusnet.po
+++ b/locale/ka/LC_MESSAGES/statusnet.po
@@ -9,17 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:27+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:20+0000\n"
 "Language-Team: Georgian <http://translatewiki.net/wiki/Portal:ka>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ka\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5992,87 +5992,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "ვებ. გვერსი"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "%s-ის ნაკადი"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "მომხმარებლის პროფილი"
-
-msgid "Public"
-msgstr "საჯარო"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "მოძებნე ადამიანები ამ საიტზე"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS პარამეტრები"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "შეცვალე პროფილის პარამეტრები"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "მომხმარებლის კონფიგურაცია"
-
-#, fuzzy
-msgid "Logout"
-msgstr "გასვლა"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "გასვლა საიტიდან"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "საიტზე შესვლა"
-
-msgid "Search"
-msgstr "ძიება"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "ძიება საიტზე"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "დახმარება"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "საიტის შესახებ"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ხდკ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "მპ"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "პირადი"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "წყარო"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "კონტაქტი"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "იარლიყი"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6829,6 +6750,13 @@ msgstr "გადადი ამ ინსტალატორზე."
 msgid "Database error"
 msgstr "მონაცემთა ბაზის შეცდომა"
 
+#, fuzzy
+msgid "Home"
+msgstr "ვებ. გვერსი"
+
+msgid "Public"
+msgstr "საჯარო"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ამ მომხმარებლის წაშლა"
@@ -7483,6 +7411,18 @@ msgstr ""
 "შეტყობინებები, რომ ჩაერთოთ საუბრებში სხვა ხალხთან. ხალხს შეუძლია "
 "გამოგიგზავნონ შეტყობინებები მხოლოდ თქვენ დასანახად."
 
+msgid "Inbox"
+msgstr "შემომავალი წერილების ყუთი"
+
+msgid "Your incoming messages"
+msgstr "თქვენი შემომავალი შეტყობინებები"
+
+msgid "Outbox"
+msgstr "გამავალი წერილების ყუთი"
+
+msgid "Your sent messages"
+msgstr "თქვენი გაგზავნილი წერილები"
+
 msgid "Could not parse message."
 msgstr "შეტყობინების გაცრა (გა-parse-ვა) ვერ მოხერხდა."
 
@@ -7561,6 +7501,20 @@ msgstr "შეტყობინება"
 msgid "from"
 msgstr "ვისგან"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "თვენ არ ხართ ამ ჯგუფის წევრი."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "არ წაშალო ეს შეტყობინება"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7674,24 +7628,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "ახალი გამოწერის ჩასმა ვერ მოხერხდა."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "მომხმარებლის პროფილი"
+
 msgid "Replies"
 msgstr "პასუხები"
 
 msgid "Favorites"
 msgstr "რჩეულები"
 
-msgid "Inbox"
-msgstr "შემომავალი წერილების ყუთი"
-
-msgid "Your incoming messages"
-msgstr "თქვენი შემომავალი შეტყობინებები"
-
-msgid "Outbox"
-msgstr "გამავალი წერილების ყუთი"
-
-msgid "Your sent messages"
-msgstr "თქვენი გაგზავნილი წერილები"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7715,6 +7661,37 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS პარამეტრები"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "შეცვალე პროფილის პარამეტრები"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "მომხმარებლის კონფიგურაცია"
+
+#, fuzzy
+msgid "Logout"
+msgstr "გასვლა"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "გასვლა საიტიდან"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "საიტზე შესვლა"
+
+msgid "Search"
+msgstr "ძიება"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "ძიება საიტზე"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7824,6 +7801,39 @@ msgstr "მოძებნე შეტყობინებებში"
 msgid "Find groups on this site"
 msgstr "მოძებნე ჯგუფები ამ საიტზე"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "დახმარება"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "საიტის შესახებ"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ხდკ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "მპ"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "პირადი"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "წყარო"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "კონტაქტი"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "იარლიყი"
+
 msgid "Untitled section"
 msgstr "უსათაურო სექცია"
 
@@ -8102,16 +8112,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "სრული სახელი ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "აღწერა ძალიან გრძელია (არაუმეტეს %d სიმბოლო)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "ადგილმდებარეობა ძალიან გრძელია (არაუმეტეს 255 სიმბოლო)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s-ის ნაკადი"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "შიგთავსი"
+#~ msgid "Everyone on this site"
+#~ msgstr "მოძებნე ადამიანები ამ საიტზე"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 33e9120240..4a924d8d21 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -11,17 +11,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:28+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:21+0000\n"
 "Language-Team: Korean <http://translatewiki.net/wiki/Portal:ko>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5936,83 +5936,9 @@ msgstr "답장하기"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "홈페이지"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s 타임라인"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "그룹 프로필"
-
-msgid "Public"
-msgstr "공개"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "이 사이트에 있는 사람 찾기"
-
-msgid "Settings"
-msgstr "메일 설정"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "프로필 세팅 바꾸기"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "메일 주소 확인"
-
-msgid "Logout"
-msgstr "로그아웃"
-
-msgid "Logout from the site"
-msgstr "이 사이트에서 로그아웃"
-
-msgid "Login to the site"
-msgstr "이 사이트에 로그인"
-
-msgid "Search"
-msgstr "검색"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "검색 도움말"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "도움말"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "정보"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "자주 묻는 질문"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "서비스 약관"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "개인정보 취급방침"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "소스 코드"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "연락하기"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "배지"
+msgid "Status"
+msgstr "StatusNet %s"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6771,6 +6697,12 @@ msgstr "이 사이트에 로그인"
 msgid "Database error"
 msgstr "데이터베이스 오류"
 
+msgid "Home"
+msgstr "홈페이지"
+
+msgid "Public"
+msgstr "공개"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "이 사용자 삭제"
@@ -7344,6 +7276,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "받은 쪽지함"
+
+msgid "Your incoming messages"
+msgstr "받은 메시지"
+
+msgid "Outbox"
+msgstr "보낸 쪽지함"
+
+msgid "Your sent messages"
+msgstr "보낸 메시지"
+
 msgid "Could not parse message."
 msgstr "메시지를 분리할 수 없습니다."
 
@@ -7420,6 +7364,20 @@ msgstr "메시지"
 msgid "from"
 msgstr "방법"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "당신은 해당 그룹의 멤버가 아닙니다."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "이 통지를 지울 수 없습니다."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7532,24 +7490,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "예약 구독을 추가 할 수 없습니다."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "그룹 프로필"
+
 msgid "Replies"
 msgstr "답신"
 
 msgid "Favorites"
 msgstr "좋아하는 글들"
 
-msgid "Inbox"
-msgstr "받은 쪽지함"
-
-msgid "Your incoming messages"
-msgstr "받은 메시지"
-
-msgid "Outbox"
-msgstr "보낸 쪽지함"
-
-msgid "Your sent messages"
-msgstr "보낸 메시지"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7574,6 +7524,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "메일 설정"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "프로필 세팅 바꾸기"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "메일 주소 확인"
+
+msgid "Logout"
+msgstr "로그아웃"
+
+msgid "Logout from the site"
+msgstr "이 사이트에서 로그아웃"
+
+msgid "Login to the site"
+msgstr "이 사이트에 로그인"
+
+msgid "Search"
+msgstr "검색"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "검색 도움말"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7687,6 +7664,39 @@ msgstr "통지들의 내용 찾기"
 msgid "Find groups on this site"
 msgstr "이 사이트에서 그룹 찾기"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "도움말"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "정보"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "자주 묻는 질문"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "서비스 약관"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "개인정보 취급방침"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "소스 코드"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "연락하기"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "배지"
+
 msgid "Untitled section"
 msgstr "제목없는 섹션"
 
@@ -7966,19 +7976,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "실명이 너무 깁니다. (최대 255글자)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "설명이 너무 길어요. (최대 %d글자)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "위치가 너무 깁니다. (최대 255글자)"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "별명이 너무 많습니다! 최대 %d개."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s 타임라인"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "만족하는"
+#~ msgid "Everyone on this site"
+#~ msgstr "이 사이트에 있는 사람 찾기"
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index a366dfc6e2..04eee7354c 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:29+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:22+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n == 1 || n%10 == 1) ? 0 : 1;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2935,9 +2935,8 @@ msgid "Type"
 msgstr "Тип"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Одберете лиценца"
+msgstr "Одберете лиценца."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -2978,9 +2977,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL-адреса за слика што ќе се прикажува со лиценцата."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Зачувај нагодувања на лиценцата"
+msgstr "Зачувај нагодувања на лиценцата."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3014,7 +3012,6 @@ msgstr ""
 "Отсега врши автоматска најава. Не треба да се користи за јавни сметачи!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Најава"
@@ -3110,9 +3107,8 @@ msgstr "Нова порака"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
-msgstr "Не можете да испратите порака до овојо корисник."
+msgstr "Не можете да испратите порака до овој корисник."
 
 #. TRANS: Form validator error displayed trying to send a direct message without content.
 #. TRANS: Client error displayed trying to send a notice without content.
@@ -5944,86 +5940,17 @@ msgid "Show more"
 msgstr "Повеќе"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
-msgstr "Одговор"
+msgstr "Одговори"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Напишете одговор..."
 
-msgid "Home"
-msgstr "Домашна страница"
-
-msgid "Friends timeline"
-msgstr "Историја на пријатели"
-
-msgid "Your profile"
-msgstr "Профил на група"
-
-msgid "Public"
-msgstr "Јавен"
-
-msgid "Everyone on this site"
-msgstr "Сите на ова мрежно место"
-
-msgid "Settings"
-msgstr "Нагодувања за СМС"
-
-msgid "Change your personal settings"
-msgstr "Измена на лични поставки"
-
-msgid "Site configuration"
-msgstr "Поставки на мреж. место"
-
-msgid "Logout"
-msgstr "Одјава"
-
-msgid "Logout from the site"
-msgstr "Одјава"
-
-msgid "Login to the site"
-msgstr "Најава"
-
-msgid "Search"
-msgstr "Барај"
-
-msgid "Search the site"
-msgstr "Пребарај по мрежното место"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помош"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "За нас"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧПП"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Услови"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Приватност"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Изворен код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Значка"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6815,6 +6742,12 @@ msgstr "Оди на инсталаторот."
 msgid "Database error"
 msgstr "Грешка во базата на податоци"
 
+msgid "Home"
+msgstr "Домашна страница"
+
+msgid "Public"
+msgstr "Јавен"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Избриши овој корисник"
@@ -7494,6 +7427,18 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да Ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
+msgid "Inbox"
+msgstr "Примени"
+
+msgid "Your incoming messages"
+msgstr "Ваши приемни пораки"
+
+msgid "Outbox"
+msgstr "За праќање"
+
+msgid "Your sent messages"
+msgstr "Ваши испратени пораки"
+
 msgid "Could not parse message."
 msgstr "Не можев да ја парсирам пораката."
 
@@ -7571,6 +7516,20 @@ msgstr "Пораки"
 msgid "from"
 msgstr "од"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Не Ви е дозволено да ја избришете оваа група."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не го бриши корисников."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Прекарот не може да стои празен."
@@ -7596,9 +7555,8 @@ msgid "Attach"
 msgstr "Приложи"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Приложи податотека"
+msgstr "Приложи податотека."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7685,24 +7643,15 @@ msgstr "Дуплирана забелешка."
 msgid "Couldn't insert new subscription."
 msgstr "Не може да се внесе нова претплата."
 
+msgid "Your profile"
+msgstr "Профил на група"
+
 msgid "Replies"
 msgstr "Одговори"
 
 msgid "Favorites"
 msgstr "Бендисани"
 
-msgid "Inbox"
-msgstr "Примени"
-
-msgid "Your incoming messages"
-msgstr "Ваши приемни пораки"
-
-msgid "Outbox"
-msgstr "За праќање"
-
-msgid "Your sent messages"
-msgstr "Ваши испратени пораки"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7726,6 +7675,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "(Описите на приклучоците не се достапни ако е оневозможено.)"
 
+msgid "Settings"
+msgstr "Нагодувања за СМС"
+
+msgid "Change your personal settings"
+msgstr "Измена на лични поставки"
+
+msgid "Site configuration"
+msgstr "Поставки на мреж. место"
+
+msgid "Logout"
+msgstr "Одјава"
+
+msgid "Logout from the site"
+msgstr "Одјава"
+
+msgid "Login to the site"
+msgstr "Најава"
+
+msgid "Search"
+msgstr "Барај"
+
+msgid "Search the site"
+msgstr "Пребарај по мрежното место"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7834,6 +7807,39 @@ msgstr "Пронајдете содржини на забелешките"
 msgid "Find groups on this site"
 msgstr "Пронајдете групи на ова мрежно место"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помош"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "За нас"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧПП"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Услови"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Приватност"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Изворен код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Значка"
+
 msgid "Untitled section"
 msgstr "Заглавие без наслов"
 
@@ -7956,11 +7962,11 @@ msgstr "Изгледот содржи податотека од типот „.%
 msgid "Error opening theme archive."
 msgstr "Грешка при отворањето на архивот за мотив."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Повеќе"
-msgstr[1] "Повеќе"
+msgstr[0] "Прикажи %d одговор"
+msgstr[1] "Прикажи ги сите %d одговори"
 
 msgid "Top posters"
 msgstr "Најактивни објавувачи"
@@ -8115,26 +8121,8 @@ msgstr "Неважечки XML. Нема XRD-корен."
 msgid "Getting backup from file '%s'."
 msgstr "Земам резерва на податотеката „%s“."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Целото име е предолго (највеќе 255 знаци)"
+#~ msgid "Friends timeline"
+#~ msgstr "Историја на пријатели"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "описот е предолг (највеќе %d знаци)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Местоположбата е предолга (дозволени се највеќе 255 знаци)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Премногу алијаси! Дозволено е највеќе %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Коментар"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Додај коментар..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Прикажи го коментарот"
-#~ msgstr[1] "Прикажи ги сите %d коментари"
+#~ msgid "Everyone on this site"
+#~ msgstr "Сите на ова мрежно место"
diff --git a/locale/ml/LC_MESSAGES/statusnet.po b/locale/ml/LC_MESSAGES/statusnet.po
index 56658d79f5..84a9210ef5 100644
--- a/locale/ml/LC_MESSAGES/statusnet.po
+++ b/locale/ml/LC_MESSAGES/statusnet.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:30+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:23+0000\n"
 "Language-Team: Malayalam <http://translatewiki.net/wiki/Portal:ml>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ml\n"
 "X-Message-Group: #out-statusnet-core\n"
@@ -5735,88 +5735,8 @@ msgid "Write a reply..."
 msgstr ""
 
 #, fuzzy
-msgid "Home"
-msgstr "ഹോംപേജ്"
-
-#, fuzzy
-msgid "Friends timeline"
-msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "അജ്ഞാതമായ കുറിപ്പ്."
-
-msgid "Public"
-msgstr "സാർവ്വജനികം"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
-
-#, fuzzy
-msgid "Settings"
-msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "ഉപയോക്തൃ ക്രമീകരണം"
-
-#, fuzzy
-msgid "Logout"
-msgstr "ലോഗൗട്ട്"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
-
-#, fuzzy
-msgid "Search"
-msgstr "തിരയുക"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "സൈറ്റിൽ തിരയുക"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "സഹായം"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "വിവരണം"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "പതിവുചോദ്യങ്ങൾ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "സ്വകാര്യത"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "സ്രോതസ്സ്"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "സമ്പർക്കം"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "സ്റ്റാറ്റസ്‌നെറ്റ്"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6553,6 +6473,13 @@ msgstr ""
 msgid "Database error"
 msgstr "ഡാറ്റാബേസ് പിഴവ്"
 
+#, fuzzy
+msgid "Home"
+msgstr "ഹോംപേജ്"
+
+msgid "Public"
+msgstr "സാർവ്വജനികം"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യുക"
@@ -7127,6 +7054,18 @@ msgstr ""
 "സന്ദേശങ്ങൾ അയയ്ക്കാവുന്നതാണ്. താങ്കൾക്ക് മാത്രം കാണാവുന്ന സന്ദേശങ്ങൾ അയയ്ക്കാൻ മറ്റുള്ളവർക്കും "
 "കഴിയുന്നതാണ്."
 
+msgid "Inbox"
+msgstr "ഇൻബോക്സ്"
+
+msgid "Your incoming messages"
+msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
+
+msgid "Outbox"
+msgstr "ഔട്ട്ബോക്സ്"
+
+msgid "Your sent messages"
+msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
+
 msgid "Could not parse message."
 msgstr ""
 
@@ -7201,6 +7140,20 @@ msgstr "സന്ദേശങ്ങൾ"
 msgid "from"
 msgstr "അയച്ചത്"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "ഈ സംഘത്തെ മായ്ക്കരുത്."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "ഈ ഉപയോക്താവിനെ നീക്കം ചെയ്യരുത്."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "വിളിപ്പേര് ശൂന്യമായിരിക്കാൻ പാടില്ല."
@@ -7315,6 +7268,10 @@ msgstr "അറിയിപ്പിന്റെ പകർപ്പ്."
 msgid "Couldn't insert new subscription."
 msgstr ""
 
+#, fuzzy
+msgid "Your profile"
+msgstr "അജ്ഞാതമായ കുറിപ്പ്."
+
 msgid "Replies"
 msgstr "മറുപടികൾ"
 
@@ -7322,18 +7279,6 @@ msgstr "മറുപടികൾ"
 msgid "Favorites"
 msgstr "%s എന്ന ഉപയോക്താവിന് പ്രിയങ്കരമായവ"
 
-msgid "Inbox"
-msgstr "ഇൻബോക്സ്"
-
-msgid "Your incoming messages"
-msgstr "താങ്കൾക്ക് വരുന്ന സന്ദേശങ്ങൾ"
-
-msgid "Outbox"
-msgstr "ഔട്ട്ബോക്സ്"
-
-msgid "Your sent messages"
-msgstr "താങ്കൾ അയച്ച സന്ദേശങ്ങൾ"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7357,6 +7302,38 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "എസ്.എം.എസ്. സജ്ജീകരണങ്ങൾ"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "താങ്കളുടെ രഹസ്യവാക്ക് മാറ്റുക"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "ഉപയോക്തൃ ക്രമീകരണം"
+
+#, fuzzy
+msgid "Logout"
+msgstr "ലോഗൗട്ട്"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "സൈറ്റിൽ നിന്നും പുറത്തുകടക്കുക"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "സൈറ്റിലേക്ക് പ്രവേശിക്കുക"
+
+#, fuzzy
+msgid "Search"
+msgstr "തിരയുക"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "സൈറ്റിൽ തിരയുക"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7465,6 +7442,39 @@ msgstr "അറിയിപ്പുകളുടെ ഉള്ളടക്കം 
 msgid "Find groups on this site"
 msgstr "ഈ സൈറ്റിലെ സംഘങ്ങൾ കണ്ടെത്തുക"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "സഹായം"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "വിവരണം"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "പതിവുചോദ്യങ്ങൾ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "സ്വകാര്യത"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "സ്രോതസ്സ്"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "സമ്പർക്കം"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr "തലക്കെട്ടില്ലാത്ത ഭാഗം"
 
@@ -7743,18 +7753,9 @@ msgid "Getting backup from file '%s'."
 msgstr ""
 
 #, fuzzy
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "പൂർണ്ണ നാമത്തിന്റെ നീളം വളരെ കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
+#~ msgid "Friends timeline"
+#~ msgstr "%s എന്ന ഉപയോക്താവിന്റെ സമയരേഖ"
 
 #, fuzzy
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "വിവരണത്തിനു നീളം കൂടുതലാണ് (പരമാവധി %d അക്ഷരം)."
-
-#, fuzzy
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "സംഘടനയുടെ പേരിന്റെ നീളം വളരെക്കൂടുതലാണ് (പരമാവധി 255 അക്ഷരങ്ങൾ)."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "ഉള്ളടക്കം"
+#~ msgid "Everyone on this site"
+#~ msgstr "ഈ സൈറ്റിലെ ആൾക്കാരെ കണ്ടെത്തുക"
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 192917074d..1fa8ea3e77 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:33+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:26+0000\n"
 "Language-Team: Norwegian (bokmål)‬ <http://translatewiki.net/wiki/Portal:no>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5961,87 +5961,9 @@ msgstr "Svar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Hjemmesiden"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidslinje"
-
-msgid "Your profile"
-msgstr "Gruppeprofil"
-
-msgid "Public"
-msgstr "Offentlig"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finn personer på dette nettstedet"
-
-#, fuzzy
-msgid "Settings"
-msgstr "SMS-innstillinger"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Endre profilinnstillingene dine"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Brukerkonfigurasjon"
-
-msgid "Logout"
-msgstr "Logg ut"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Logg ut fra nettstedet"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Log inn på nettstedet"
-
-msgid "Search"
-msgstr "Søk"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Søk nettsted"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "OSS/FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#, fuzzy
-msgid "Privacy"
-msgstr "Privat"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kilde"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Knuff"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6808,6 +6730,12 @@ msgstr "Log inn på nettstedet"
 msgid "Database error"
 msgstr "Databasefeil"
 
+msgid "Home"
+msgstr "Hjemmesiden"
+
+msgid "Public"
+msgstr "Offentlig"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Slett denne brukeren"
@@ -7483,6 +7411,18 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
+msgid "Inbox"
+msgstr "Innboks"
+
+msgid "Your incoming messages"
+msgstr "Dine innkommende meldinger"
+
+msgid "Outbox"
+msgstr "Utboks"
+
+msgid "Your sent messages"
+msgstr "Dine sendte meldinger"
+
 msgid "Could not parse message."
 msgstr "Kunne ikke tolke meldingen."
 
@@ -7561,6 +7501,20 @@ msgstr "Melding"
 msgid "from"
 msgstr "fra"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du har ikke tillatelse til å slette denne gruppen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ikke slett denne gruppen"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7677,24 +7631,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
+msgid "Your profile"
+msgstr "Gruppeprofil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favoritter"
 
-msgid "Inbox"
-msgstr "Innboks"
-
-msgid "Your incoming messages"
-msgstr "Dine innkommende meldinger"
-
-msgid "Outbox"
-msgstr "Utboks"
-
-msgid "Your sent messages"
-msgstr "Dine sendte meldinger"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
@@ -7718,6 +7663,36 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#, fuzzy
+msgid "Settings"
+msgstr "SMS-innstillinger"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Endre profilinnstillingene dine"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Brukerkonfigurasjon"
+
+msgid "Logout"
+msgstr "Logg ut"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Logg ut fra nettstedet"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Log inn på nettstedet"
+
+msgid "Search"
+msgstr "Søk"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk nettsted"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7832,6 +7807,41 @@ msgstr "Finn innhold i notiser"
 msgid "Find groups on this site"
 msgstr "Finn grupper på dette nettstedet"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjelp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "OSS/FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#, fuzzy
+msgid "Privacy"
+msgstr "Privat"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kilde"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Knuff"
+
 #, fuzzy
 msgid "Untitled section"
 msgstr "Side uten tittel"
@@ -8120,19 +8130,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Fullt navn er for langt (maks 255 tegn)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "beskrivelse er for lang (maks %d tegn)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Plassering er for lang (maks 255 tegn)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "For mange alias! Maksimum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidslinje"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innhold"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finn personer på dette nettstedet"
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 90e79433cf..a7d99e5410 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:31+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:24+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -2961,9 +2961,8 @@ msgid "Type"
 msgstr "Type"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Selecteer licentie"
+msgstr "Selecteer een licentie."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3002,9 +3001,8 @@ msgid "URL for an image to display with the license."
 msgstr "Een URL voor een afbeelding om weer te geven met de licentie."
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Licentieinstellingen opslaan"
+msgstr "Licentieinstellingen opslaan."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3039,7 +3037,6 @@ msgid "Automatically login in the future; not for shared computers!"
 msgstr "Voortaan automatisch aanmelden. Niet gebruiken op gedeelde computers!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Aanmelden"
@@ -3136,7 +3133,6 @@ msgstr "Nieuw bericht"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
@@ -5987,86 +5983,17 @@ msgid "Show more"
 msgstr "Meer weergeven"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Antwoorden"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
+msgstr "Schrijf een antwoord..."
 
-msgid "Home"
-msgstr "Start"
-
-msgid "Friends timeline"
-msgstr "Tijdlijn van vrienden"
-
-msgid "Your profile"
-msgstr "Uw profiel"
-
-msgid "Public"
-msgstr "Openbaar"
-
-msgid "Everyone on this site"
-msgstr "Iedereen op deze site"
-
-msgid "Settings"
-msgstr "SMS-instellingen"
-
-msgid "Change your personal settings"
-msgstr "Persoonlijke instellingen wijzigen"
-
-msgid "Site configuration"
-msgstr "Siteinstellingen"
-
-msgid "Logout"
-msgstr "Afmelden"
-
-msgid "Logout from the site"
-msgstr "Van de site afmelden"
-
-msgid "Login to the site"
-msgstr "Bij de site aanmelden"
-
-msgid "Search"
-msgstr "Zoeken"
-
-msgid "Search the site"
-msgstr "Site doorzoeken"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Help"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Over"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Veel gestelde vragen"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Gebruiksvoorwaarden"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacy"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Broncode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contact"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Widget"
+#, fuzzy
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6878,6 +6805,12 @@ msgstr "Naar het installatieprogramma gaan."
 msgid "Database error"
 msgstr "Databasefout"
 
+msgid "Home"
+msgstr "Start"
+
+msgid "Public"
+msgstr "Openbaar"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Gebruiker verwijderen"
@@ -7556,6 +7489,18 @@ msgstr ""
 "U hebt geen privéberichten. U kunt privéberichten verzenden aan andere "
 "gebruikers. Mensen kunnen u privéberichten sturen die alleen u kunt lezen."
 
+msgid "Inbox"
+msgstr "Postvak IN"
+
+msgid "Your incoming messages"
+msgstr "Uw inkomende berichten"
+
+msgid "Outbox"
+msgstr "Postvak UIT"
+
+msgid "Your sent messages"
+msgstr "Uw verzonden berichten"
+
 msgid "Could not parse message."
 msgstr "Het was niet mogelijk het bericht te verwerken."
 
@@ -7633,6 +7578,20 @@ msgstr "Berichten"
 msgid "from"
 msgstr "van"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "U mag deze groep niet verwijderen."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Deze gebruiker niet verwijderen."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Gebruikersnaam kan niet leeg zijn."
@@ -7658,9 +7617,8 @@ msgid "Attach"
 msgstr "Toevoegen"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Bestand toevoegen"
+msgstr "Voeg een bestand toe."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7747,24 +7705,15 @@ msgstr "Dubbele mededeling."
 msgid "Couldn't insert new subscription."
 msgstr "Kon nieuw abonnement niet toevoegen."
 
+msgid "Your profile"
+msgstr "Uw profiel"
+
 msgid "Replies"
 msgstr "Antwoorden"
 
 msgid "Favorites"
 msgstr "Favorieten"
 
-msgid "Inbox"
-msgstr "Postvak IN"
-
-msgid "Your incoming messages"
-msgstr "Uw inkomende berichten"
-
-msgid "Outbox"
-msgstr "Postvak UIT"
-
-msgid "Your sent messages"
-msgstr "Uw verzonden berichten"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7788,6 +7737,30 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr "Plug-inbeschrijvingen zijn niet beschikbaar als uitgeschakeld."
 
+msgid "Settings"
+msgstr "SMS-instellingen"
+
+msgid "Change your personal settings"
+msgstr "Persoonlijke instellingen wijzigen"
+
+msgid "Site configuration"
+msgstr "Siteinstellingen"
+
+msgid "Logout"
+msgstr "Afmelden"
+
+msgid "Logout from the site"
+msgstr "Van de site afmelden"
+
+msgid "Login to the site"
+msgstr "Bij de site aanmelden"
+
+msgid "Search"
+msgstr "Zoeken"
+
+msgid "Search the site"
+msgstr "Site doorzoeken"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7896,6 +7869,39 @@ msgstr "Inhoud van mededelingen vinden"
 msgid "Find groups on this site"
 msgstr "Groepen op deze site vinden"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Help"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Over"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Veel gestelde vragen"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Gebruiksvoorwaarden"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacy"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Broncode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contact"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Widget"
+
 msgid "Untitled section"
 msgstr "Naamloze sectie"
 
@@ -8025,11 +8031,11 @@ msgstr ""
 "Er is een fout opgetreden tijdens het openen van het archiefbestand met de "
 "vormgeving."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Meer weergeven"
-msgstr[1] "Meer weergeven"
+msgstr[0] "Antwoord weergegeven"
+msgstr[1] "Alle %d antwoorden weergegeven"
 
 msgid "Top posters"
 msgstr "Meest actieve gebruikers"
@@ -8183,26 +8189,8 @@ msgstr "Ongeldige XML. De XRD-root mist."
 msgid "Getting backup from file '%s'."
 msgstr "De back-up wordt uit het bestand \"%s\" geladen."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "De volledige naam is te lang (maximaal 255 tekens)."
+#~ msgid "Friends timeline"
+#~ msgstr "Tijdlijn van vrienden"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "de beschrijving is te lang (maximaal %d tekens)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "De locatie is te lang (maximaal 255 tekens)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Te veel aliassen! Het maximale aantal is %d."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Opmerking"
-
-#~ msgid "Add a comment..."
-#~ msgstr "Opmerking toevoegen..."
-
-#~ msgid "Show all %d comment"
-#~ msgid_plural "Show all %d comments"
-#~ msgstr[0] "Opmerking weergeven"
-#~ msgstr[1] "Alle %d opmerkingen weergeven"
+#~ msgid "Everyone on this site"
+#~ msgstr "Iedereen op deze site"
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 7915f43312..ba6a86422f 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:32+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:25+0000\n"
 "Language-Team: Norwegian Nynorsk <http://translatewiki.net/wiki/Portal:nn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6043,84 +6043,9 @@ msgstr "Svar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Heimeside"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidsline"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Gruppe profil"
-
-msgid "Public"
-msgstr "Offentleg"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Finn folk på denne sida"
-
-msgid "Settings"
-msgstr "Avatar-innstillingar"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Endra profilinnstillingane dine"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "SMS bekreftelse"
-
-msgid "Logout"
-msgstr "Logo"
-
-msgid "Logout from the site"
-msgstr "Logg inn "
-
-msgid "Login to the site"
-msgstr "Logg inn "
-
-msgid "Search"
-msgstr "Søk"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Søk"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjelp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "OSS"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Personvern"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kjeldekode"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#, fuzzy
-msgid "Badge"
-msgstr "Dult"
+msgid "Status"
+msgstr "Statistikk"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6899,6 +6824,12 @@ msgstr "Logg inn or sida"
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Heimeside"
+
+msgid "Public"
+msgstr "Offentleg"
+
 #. TRANS: Description of form for deleting a user.
 #, fuzzy
 msgid "Delete this user"
@@ -7490,6 +7421,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr "Innboks"
+
+msgid "Your incoming messages"
+msgstr "Dine innkomande meldinger"
+
+msgid "Outbox"
+msgstr "Utboks"
+
+msgid "Your sent messages"
+msgstr "Dine sende meldingar"
+
 msgid "Could not parse message."
 msgstr "Kunne ikkje prosessera melding."
 
@@ -7568,6 +7511,20 @@ msgstr "Melding"
 msgid "from"
 msgstr " frå "
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du er ikkje medlem av den gruppa."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ikkje slett denne gruppa"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7685,24 +7642,16 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Gruppe profil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favorittar"
 
-msgid "Inbox"
-msgstr "Innboks"
-
-msgid "Your incoming messages"
-msgstr "Dine innkomande meldinger"
-
-msgid "Outbox"
-msgstr "Utboks"
-
-msgid "Your sent messages"
-msgstr "Dine sende meldingar"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7727,6 +7676,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Avatar-innstillingar"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Endra profilinnstillingane dine"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "SMS bekreftelse"
+
+msgid "Logout"
+msgstr "Logo"
+
+msgid "Logout from the site"
+msgstr "Logg inn "
+
+msgid "Login to the site"
+msgstr "Logg inn "
+
+msgid "Search"
+msgstr "Søk"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Søk"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7843,6 +7819,40 @@ msgstr "Søk i innhaldet av notisar"
 msgid "Find groups on this site"
 msgstr "Finn grupper på denne sida"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjelp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "OSS"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Personvern"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kjeldekode"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#, fuzzy
+msgid "Badge"
+msgstr "Dult"
+
 msgid "Untitled section"
 msgstr "Seksjon utan tittel"
 
@@ -8133,16 +8143,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Plassering er for lang (maksimalt 255 teikn)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidsline"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innhald"
+#~ msgid "Everyone on this site"
+#~ msgstr "Finn folk på denne sida"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index baea938057..f2f776d44e 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:34+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:27+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <http://translatewiki.net/wiki/Portal:pl>\n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ( (n%10 >= 2 && n%10 <= 4 && "
 "(n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: #out-statusnet-core\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6004,82 +6004,9 @@ msgstr "Odpowiedz"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Strona domowa"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Oś czasu użytkownika %s"
-
-msgid "Your profile"
-msgstr "Profil grupy"
-
-msgid "Public"
-msgstr "Publiczny"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Znajdź osoby na tej witrynie"
-
-msgid "Settings"
-msgstr "Ustawienia SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Zmień ustawienia profilu"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Konfiguracja użytkownika"
-
-msgid "Logout"
-msgstr "Wyloguj się"
-
-msgid "Logout from the site"
-msgstr "Wyloguj się z witryny"
-
-msgid "Login to the site"
-msgstr "Zaloguj się na witrynie"
-
-msgid "Search"
-msgstr "Wyszukaj"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Przeszukaj witrynę"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Pomoc"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "O usłudze"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Prywatność"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kod źródłowy"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Odznaka"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6877,6 +6804,12 @@ msgstr "Przejdź do instalatora."
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
+msgid "Home"
+msgstr "Strona domowa"
+
+msgid "Public"
+msgstr "Publiczny"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
@@ -7559,6 +7492,18 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
+msgid "Inbox"
+msgstr "Odebrane"
+
+msgid "Your incoming messages"
+msgstr "Wiadomości przychodzące"
+
+msgid "Outbox"
+msgstr "Wysłane"
+
+msgid "Your sent messages"
+msgstr "Wysłane wiadomości"
+
 msgid "Could not parse message."
 msgstr "Nie można przetworzyć wiadomości."
 
@@ -7635,6 +7580,20 @@ msgstr "Wiadomość"
 msgid "from"
 msgstr "z"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Brak uprawnienia do usunięcia tej grupy."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Nie usuwaj tego użytkownika"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Pseudonim nie może być pusty."
@@ -7750,24 +7709,15 @@ msgstr "Podwójny wpis."
 msgid "Couldn't insert new subscription."
 msgstr "Nie można wprowadzić nowej subskrypcji."
 
+msgid "Your profile"
+msgstr "Profil grupy"
+
 msgid "Replies"
 msgstr "Odpowiedzi"
 
 msgid "Favorites"
 msgstr "Ulubione"
 
-msgid "Inbox"
-msgstr "Odebrane"
-
-msgid "Your incoming messages"
-msgstr "Wiadomości przychodzące"
-
-msgid "Outbox"
-msgstr "Wysłane"
-
-msgid "Your sent messages"
-msgstr "Wysłane wiadomości"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7791,6 +7741,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Ustawienia SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Zmień ustawienia profilu"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguracja użytkownika"
+
+msgid "Logout"
+msgstr "Wyloguj się"
+
+msgid "Logout from the site"
+msgstr "Wyloguj się z witryny"
+
+msgid "Login to the site"
+msgstr "Zaloguj się na witrynie"
+
+msgid "Search"
+msgstr "Wyszukaj"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Przeszukaj witrynę"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7899,6 +7876,39 @@ msgstr "Przeszukaj zawartość wpisów"
 msgid "Find groups on this site"
 msgstr "Znajdź grupy na tej witrynie"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Pomoc"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "O usłudze"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Prywatność"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kod źródłowy"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Odznaka"
+
 msgid "Untitled section"
 msgstr "Sekcja bez nazwy"
 
@@ -8194,19 +8204,10 @@ msgstr "Nieprawidłowy kod XML, brak głównego XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Pobieranie kopii zapasowej z pliku \"%s\"."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Imię i nazwisko jest za długie (maksymalnie 255 znaków)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Opis jest za długi (maksymalnie %d znak)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Położenie jest za długie (maksymalnie 255 znaków)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Za dużo aliasów. Maksymalnie dozwolony jest %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Oś czasu użytkownika %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Treść"
+#~ msgid "Everyone on this site"
+#~ msgstr "Znajdź osoby na tej witrynie"
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index 5794a3272f..715f73afa7 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -8,6 +8,7 @@
 # Author: Hamilton Abreu
 # Author: Ipublicis
 # Author: McDutchie
+# Author: SandroHc
 # Author: Waldir
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -16,17 +17,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:35+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:28+0000\n"
 "Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -302,7 +303,6 @@ msgid "Could not update your design."
 msgstr "Não foi possível actualizar o seu estilo."
 
 #. TRANS: Title for Atom feed.
-#, fuzzy
 msgctxt "ATOM"
 msgid "Main"
 msgstr "Principal"
@@ -332,7 +332,7 @@ msgid "%s favorites"
 msgstr "Favoritas de %s"
 
 #. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%s memberships"
 msgstr "Membros do grupo %s"
 
@@ -376,7 +376,7 @@ msgstr "Mensagem não tem texto!"
 #. TRANS: %d is the maximum number of characters for a message.
 #. TRANS: Form validation error displayed when message content is too long.
 #. TRANS: %d is the maximum number of characters for a message.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum message size is %d character."
 msgid_plural "That's too long. Maximum message size is %d characters."
 msgstr[0] "Demasiado longo. Tamanho máx. das mensagens é %d caracteres."
@@ -387,13 +387,11 @@ msgid "Recipient user not found."
 msgstr "Destinatário não encontrado."
 
 #. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-#, fuzzy
 msgid "Cannot send direct messages to users who aren't your friend."
 msgstr ""
 "Não pode enviar mensagens directas a utilizadores que não sejam amigos."
 
 #. TRANS: Client error displayed trying to direct message self (403).
-#, fuzzy
 msgid ""
 "Do not send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -443,7 +441,6 @@ msgid "You cannot unfollow yourself."
 msgstr "Não pode deixar de seguir-se a si próprio."
 
 #. TRANS: Client error displayed when supplying invalid parameters to an API call checking if a friendship exists.
-#, fuzzy
 msgid "Two valid IDs or nick names must be supplied."
 msgstr "Têm de ser fornecidos dois IDs ou nomes de utilizador válidos."
 
@@ -486,7 +483,6 @@ msgstr "Página de ínicio não é uma URL válida."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Full name is too long (maximum 255 characters)."
 msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 
@@ -501,7 +497,7 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of characters for the description.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed characters.
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (maximum %d character)."
 msgid_plural "Description is too long (maximum %d characters)."
 msgstr[0] "Descrição demasiado longa (máx. %d caracteres)."
@@ -512,7 +508,6 @@ msgstr[1] "Descrição demasiado longa (máx. %d caracteres)."
 #. TRANS: Group edit form validation error.
 #. TRANS: Group create form validation error.
 #. TRANS: Validation error in form for profile settings.
-#, fuzzy
 msgid "Location is too long (maximum 255 characters)."
 msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 
@@ -524,7 +519,7 @@ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
 #. TRANS: %d is the maximum number of allowed aliases.
 #. TRANS: Group create form validation error.
 #. TRANS: %d is the maximum number of allowed aliases.
-#, fuzzy, php-format
+#, php-format
 msgid "Too many aliases! Maximum %d allowed."
 msgid_plural "Too many aliases! Maximum %d allowed."
 msgstr[0] "Demasiados nomes alternativos! Máx. %d."
@@ -641,7 +636,6 @@ msgstr "Utilizador só deve conter letras minúsculas e números. Sem espaços."
 
 #. TRANS: API validation exception thrown when alias is the same as nickname.
 #. TRANS: Group create form validation error.
-#, fuzzy
 msgid "Alias cannot be the same as nickname."
 msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 
@@ -650,7 +644,6 @@ msgid "Upload failed."
 msgstr "O upload falhou."
 
 #. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#, fuzzy
 msgid "Invalid request token or verifier."
 msgstr "Chave de entrada especificada é inválida."
 
@@ -659,12 +652,10 @@ msgid "No oauth_token parameter provided."
 msgstr "Não foi fornecido o parâmetro oauth_token."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Invalid request token."
 msgstr "Chave inválida."
 
 #. TRANS: Client error given when an invalid request token was passed to the OAuth API.
-#, fuzzy
 msgid "Request token already authorized."
 msgstr "Não tem autorização."
 
@@ -682,7 +673,6 @@ msgid "Invalid nickname / password!"
 msgstr "Utilizador ou senha inválidos!"
 
 #. TRANS: Server error displayed when a database action fails.
-#, fuzzy
 msgid "Database error inserting oauth_token_association."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
@@ -711,14 +701,14 @@ msgstr "Permitir ou negar acesso"
 
 #. TRANS: User notification of external application requesting account access.
 #. TRANS: %3$s is the access type requested (read-write or read-only), %4$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "An application would like the ability to <strong>%3$s</strong> your %4$s "
 "account data. You should only give access to your %4$s account to third "
 "parties you trust."
 msgstr ""
-"A aplicação <strong>%1$s</strong> por <strong>%2$s</strong> solicita "
-"permissão para <strong>%3$s</strong> os dados da sua conta %4$s. Só deve "
+"A aplicação <strong>%3$s</strong> por <strong>%4$s</strong> solicita "
+"permissão para <strong>%4$s</strong> os dados da sua conta %4$s. Só deve "
 "permitir acesso à sua conta %4$s a terceiros da sua confiança."
 
 #. TRANS: User notification of external application requesting account access.
@@ -735,7 +725,6 @@ msgstr ""
 "permitir acesso à sua conta %4$s a terceiros da sua confiança."
 
 #. TRANS: Fieldset legend.
-#, fuzzy
 msgctxt "LEGEND"
 msgid "Account"
 msgstr "Conta"
@@ -762,29 +751,25 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. TRANS: Button text that when clicked will allow access to an account by an external application.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Allow"
 msgstr "Permitir"
 
 #. TRANS: Form instructions.
-#, fuzzy
 msgid "Authorize access to your account information."
 msgstr "Permitir ou negar acesso à informação da sua conta."
 
 #. TRANS: Header for user notification after revoking OAuth access to an application.
-#, fuzzy
 msgid "Authorization canceled."
 msgstr "Confirmação do mensageiro instantâneo cancelada."
 
 #. TRANS: User notification after revoking OAuth access to an application.
 #. TRANS: %s is an OAuth token.
-#, fuzzy, php-format
+#, php-format
 msgid "The request token %s has been revoked."
 msgstr "A chave de pedido %s foi negada e retirada."
 
 #. TRANS: Title of the page notifying the user that an anonymous client application was successfully authorized to access the user's account with OAuth.
-#, fuzzy
 msgid "You have successfully authorized the application"
 msgstr "Não tem autorização."
 
@@ -796,9 +781,9 @@ msgstr ""
 
 #. TRANS: Title of the page notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
-#, fuzzy, php-format
+#, php-format
 msgid "You have successfully authorized %s"
-msgstr "Não tem autorização."
+msgstr "Não tem autorização %s"
 
 #. TRANS: Message notifying the user that the client application was successfully authorized to access the user's account with OAuth.
 #. TRANS: %s is the authorised application name.
@@ -840,15 +825,14 @@ msgstr "Já repetiu essa nota."
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
 #. TRANS: Client error shown when using a non-supported HTTP method.
 #. TRANS: Client exception thrown when using an unsupported HTTP method.
-#, fuzzy
 msgid "HTTP method not supported."
 msgstr "Método da API não encontrado."
 
 #. TRANS: Exception thrown requesting an unsupported notice output format.
 #. TRANS: %s is the requested output format.
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported format: %s."
-msgstr "Formato não suportado."
+msgstr "Formato não suportado: %s."
 
 #. TRANS: Client error displayed requesting a deleted status.
 msgid "Status deleted."
@@ -864,14 +848,13 @@ msgstr ""
 
 #. TRANS: Client error displayed when a user has no rights to delete notices of other users.
 #. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#, fuzzy
 msgid "Cannot delete this notice."
 msgstr "Nota não pode ser apagada."
 
 #. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted notice %d"
-msgstr "Apagar nota"
+msgstr "Apagar nota %d"
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 msgid "Client must provide a 'status' parameter with a value."
@@ -879,20 +862,19 @@ msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
 #. TRANS: Client error displayed when the parameter "status" is missing.
 #. TRANS: %d is the maximum number of character for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Maximum notice size is %d character."
 msgid_plural "That's too long. Maximum notice size is %d characters."
 msgstr[0] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 msgstr[1] "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 
 #. TRANS: Client error displayed when replying to a non-existing notice.
-#, fuzzy
 msgid "Parent notice not found."
 msgstr "Método da API não encontrado."
 
 #. TRANS: Client error displayed exceeding the maximum notice length.
 #. TRANS: %d is the maximum lenth for a notice.
-#, fuzzy, php-format
+#, php-format
 msgid "Maximum notice size is %d character, including attachment URL."
 msgid_plural "Maximum notice size is %d characters, including attachment URL."
 msgstr[0] "Tamanho máx. das notas é %d caracteres, incluindo a URL do anexo."
@@ -912,9 +894,9 @@ msgstr "%1$s / Favoritas de %2$s"
 #. TRANS: Subtitle for timeline of most recent favourite notices by a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user's full name,
 #. TRANS: %3$s is a user nickname.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %3$s."
-msgstr "%1$s actualizações preferidas por %2$s / %2$s."
+msgstr "%1$s actualizações preferidas por %2$s / %3$s."
 
 #. TRANS: Title for timeline of most recent mentions of a user.
 #. TRANS: %1$s is the StatusNet sitename, %2$s is a user nickname.
@@ -941,7 +923,6 @@ msgid "%s updates from everyone!"
 msgstr "%s actualizações de todos!"
 
 #. TRANS: Server error displayed calling unimplemented API method for 'retweeted by me'.
-#, fuzzy
 msgid "Unimplemented."
 msgstr "Método não implementado."
 
@@ -950,7 +931,7 @@ msgstr "Método não implementado."
 msgid "Repeated to %s"
 msgstr "Repetida para %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
 msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 
@@ -960,9 +941,9 @@ msgstr "%1$s actualizações em resposta a actualizações de %2$s / %3$s."
 msgid "Repeats of %s"
 msgstr "Repetições de %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%s (@%s) adicionou a sua nota às favoritas."
+msgstr "%1$s avisos que %2$s / %3$s repetiu."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -979,7 +960,6 @@ msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Actualizações categorizadas com %1$s em %2$s!"
 
 #. TRANS: Client error displayed trying to add a notice to another user's timeline.
-#, fuzzy
 msgid "Only the user can add to their own timeline."
 msgstr "Só o próprio utilizador pode ler a sua caixa de correio."
 
@@ -1011,24 +991,23 @@ msgstr ""
 
 #. TRANS: Client error displayed when posting a notice without content through the API.
 #. TRANS: %d is the notice ID (number).
-#, fuzzy, php-format
+#, php-format
 msgid "No content for notice %d."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Nenhum conteúdo para a notícia %d."
 
 #. TRANS: Client error displayed when using another format than AtomPub.
 #. TRANS: %s is the notice URI.
-#, fuzzy, php-format
+#, php-format
 msgid "Notice with URI \"%s\" already exists."
-msgstr "Não existe nenhuma nota com essa identificação."
+msgstr "Notícia com URI \"%s\" já existe."
 
 #. TRANS: Server error for unfinished API method showTrends.
 msgid "API method under construction."
 msgstr "Método da API em desenvolvimento."
 
 #. TRANS: Client error displayed when requesting user information for a non-existing user.
-#, fuzzy
 msgid "User not found."
-msgstr "Método da API não encontrado."
+msgstr "Utilizador não encontrado."
 
 #. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
 #. TRANS: Client exception.
@@ -1038,80 +1017,69 @@ msgstr "Perfil não foi encontrado."
 
 #. TRANS: Subtitle for Atom favorites feed.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Notices %1$s has favorited on %2$s"
-msgstr "Actualizações de %1$s e amigos no %2$s!"
+msgstr "Actualizações de %1$s têm favoritos em %2$s"
 
 #. TRANS: Client exception thrown when trying to set a favorite for another user.
 #. TRANS: Client exception thrown when trying to subscribe another user.
-#, fuzzy
 msgid "Cannot add someone else's subscription."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não é possível adicionar uma subscrição de outra pessoa."
 
 #. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
-#, fuzzy
 msgid "Can only handle favorite activities."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só podes lidar com as tuas actividades favoritas."
 
 #. TRANS: Client exception thrown when trying favorite an object that is not a notice.
-#, fuzzy
 msgid "Can only fave notices."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só pode por actualizações nos favoritos."
 
 #. TRANS: Client exception thrown when trying favorite a notice without content.
-#, fuzzy
 msgid "Unknown note."
-msgstr "Desconhecida"
+msgstr "Nota desconhecida."
 
 #. TRANS: Client exception thrown when trying favorite an already favorited notice.
-#, fuzzy
 msgid "Already a favorite."
-msgstr "Adicionar às favoritas"
+msgstr "Já nos favoritos"
 
 #. TRANS: Title for group membership feed.
 #. TRANS: %s is a username.
-#, fuzzy, php-format
+#, php-format
 msgid "%s group memberships"
-msgstr "Membros do grupo %s"
+msgstr "%s membros do grupo"
 
 #. TRANS: Subtitle for group membership feed.
 #. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "Groups %1$s is a member of on %2$s"
-msgstr "Grupos de que %s é membro"
+msgstr "Os grupos %1$s são membros em %2$s"
 
 #. TRANS: Client exception thrown when trying subscribe someone else to a group.
-#, fuzzy
 msgid "Cannot add someone else's membership."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não é possível adicionar alguém já subscrito."
 
 #. TRANS: Client error displayed when not using the POST verb.
 #. TRANS: Do not translate POST.
-#, fuzzy
 msgid "Can only handle join activities."
-msgstr "Procurar no conteúdo das notas"
+msgstr "Só podes tratar de participar nas atividades."
 
 #. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
-#, fuzzy
 msgid "Unknown group."
-msgstr "Desconhecida"
+msgstr "Grupo desconhecido."
 
 #. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
-#, fuzzy
 msgid "Already a member."
-msgstr "Todos os membros"
+msgstr "Já és um membro."
 
 #. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
 msgid "Blocked by admin."
-msgstr ""
+msgstr "Bloqueado pelos administradores."
 
 #. TRANS: Client exception thrown when referencing a non-existing favorite.
-#, fuzzy
 msgid "No such favorite."
-msgstr "Ficheiro não foi encontrado."
+msgstr "Nenhum favorito encontrado."
 
 #. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
-#, fuzzy
 msgid "Cannot delete someone else's favorite."
 msgstr "Não foi possível eliminar o favorito."
 
@@ -1146,26 +1114,24 @@ msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
 #. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
-#, fuzzy
 msgid "Not a member."
-msgstr "Todos os membros"
+msgstr "Não é membro."
 
 #. TRANS: Client exception thrown when deleting someone else's membership.
-#, fuzzy
 msgid "Cannot delete someone else's membership."
 msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
 #. TRANS: %d is the non-existing profile ID number.
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile id: %d."
-msgstr "Perfil não foi encontrado."
+msgstr "Nenhum ID de perfil: %d."
 
 #. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
 #. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
-#, fuzzy, php-format
+#, php-format
 msgid "Profile %1$d not subscribed to profile %2$d."
-msgstr "Não subscreveu esse perfil."
+msgstr "O perfil %1$d não subscreveu o perfil %2$d."
 
 #. TRANS: Client exception thrown when trying to delete a subscription of another user.
 #, fuzzy
@@ -1174,9 +1140,9 @@ msgstr "Não foi possível apagar a auto-subscrição."
 
 #. TRANS: Subtitle for Atom subscription feed.
 #. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
-#, fuzzy, php-format
+#, php-format
 msgid "People %1$s has subscribed to on %2$s"
-msgstr "Pessoas que subscrevem %s"
+msgstr "As pessoas %1$s subscreveram %2$s"
 
 #. TRANS: Client error displayed when not using the follow verb.
 msgid "Can only handle Follow activities."
@@ -1184,19 +1150,19 @@ msgstr ""
 
 #. TRANS: Client exception thrown when subscribing to an object that is not a person.
 msgid "Can only follow people."
-msgstr ""
+msgstr "Só podes seguir pessoas."
 
 #. TRANS: Client exception thrown when subscribing to a non-existing profile.
 #. TRANS: %s is the unknown profile ID.
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown profile %s."
-msgstr "Tipo do ficheiro é desconhecido"
+msgstr "Tipo do ficheiro %s é desconhecido."
 
 #. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
 #. TRANS: %s is the profile the user already has a subscription on.
-#, fuzzy, php-format
+#, php-format
 msgid "Already subscribed to %s."
-msgstr "Já subscrito!"
+msgstr "Já subscrito em %s."
 
 #. TRANS: Client error displayed trying to get a non-existing attachment.
 msgid "No such attachment."
@@ -1260,20 +1226,17 @@ msgstr "Antevisão"
 
 #. TRANS: Button on avatar upload page to delete current avatar.
 #. TRANS: Button text for user account deletion.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Delete"
 msgstr "Apagar"
 
 #. TRANS: Button on avatar upload page to upload an avatar.
 #. TRANS: Submit button to confirm upload of a user backup file for account restore.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Carregar"
 
 #. TRANS: Button on avatar upload crop form to confirm a selected crop as avatar.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Crop"
 msgstr "Cortar"
@@ -1283,9 +1246,8 @@ msgid "No file uploaded."
 msgstr "Não foi carregado nenhum ficheiro."
 
 #. TRANS: Avatar upload form instruction after uploading a file.
-#, fuzzy
 msgid "Pick a square area of the image to be your avatar."
-msgstr "Escolha uma área quadrada da imagem para ser o seu avatar"
+msgstr "Escolhe uma área quadrada da imagem para ser o teu avatar."
 
 #. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
 #. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
@@ -1307,12 +1269,11 @@ msgstr "Avatar apagado."
 #. TRANS: Title for backup account page.
 #. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
 msgid "Backup account"
-msgstr ""
+msgstr "Backup da conta"
 
 #. TRANS: Client exception thrown when trying to backup an account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can backup their account."
-msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+msgstr "Somente utilizadores registados podem fazer o backup da sua conta."
 
 #. TRANS: Client exception thrown when trying to backup an account without having backup rights.
 msgid "You may not backup your account."
@@ -1328,14 +1289,13 @@ msgid ""
 msgstr ""
 
 #. TRANS: Submit button to backup an account on the backup account page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Fundo"
+msgstr "Backup"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 msgid "Backup your account."
-msgstr ""
+msgstr "Backup da tua conta."
 
 #. TRANS: Client error displayed when blocking a user that has already been blocked.
 msgid "You already blocked that user."
@@ -1368,9 +1328,8 @@ msgid "No"
 msgstr "Não"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
-#, fuzzy
 msgid "Do not block this user."
-msgstr "Não bloquear este utilizador"
+msgstr "Não bloquear este utilizador."
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -1383,9 +1342,8 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#, fuzzy
 msgid "Block this user."
-msgstr "Bloquear este utilizador"
+msgstr "Bloquear este utilizador."
 
 #. TRANS: Server error displayed when blocking a user fails.
 msgid "Failed to save block information."
@@ -1412,7 +1370,6 @@ msgid "Unblock user from group"
 msgstr "Desbloquear utilizador do grupo"
 
 #. TRANS: Button text for unblocking a user from a group.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Unblock"
 msgstr "Desbloquear"
@@ -1452,19 +1409,16 @@ msgstr "Esse endereço já tinha sido confirmado."
 msgid "Couldn't update user."
 msgstr "Não foi possível actualizar o utilizador."
 
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Não foi possível actualizar o registo do utilizador."
+msgstr "Não foi possível actualizar as preferências do utilizador."
 
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Não foi possível inserir nova subscrição."
+msgstr "Não foi possível inserir as preferências do utilizador."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
-#, fuzzy
 msgid "Could not delete address confirmation."
-msgstr "Não foi possível apagar a confirmação do mensageiro instantâneo."
+msgstr "Não foi possível excluir a confirmação do endereço."
 
 #. TRANS: Title for the contact address confirmation action.
 msgid "Confirm address"
@@ -1486,41 +1440,39 @@ msgid "Notices"
 msgstr "Notas"
 
 #. TRANS: Client exception displayed trying to delete a user account while not logged in.
-#, fuzzy
 msgid "Only logged-in users can delete their account."
-msgstr "Só utilizadores com sessão iniciada podem repetir notas."
+msgstr "Apenas utilizadores conectados podem apagar a sua conta."
 
 #. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
-#, fuzzy
 msgid "You cannot delete your account."
-msgstr "Não pode apagar utilizadores."
+msgstr "Não podes apagar a tua conta."
 
 #. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
 msgid "I am sure."
-msgstr ""
+msgstr "Eu tenho certeza."
 
 #. TRANS: Notification for user about the text that must be input to be able to delete a user account.
 #. TRANS: %s is the text that needs to be input.
 #, php-format
 msgid "You must write \"%s\" exactly in the box."
-msgstr ""
+msgstr "Deves escrever exactamente \"%s\" na caixa."
 
 #. TRANS: Confirmation that a user account has been deleted.
-#, fuzzy
 msgid "Account deleted."
-msgstr "Avatar apagado."
+msgstr "Conta apagada."
 
 #. TRANS: Page title for page on which a user account can be deleted.
 #. TRANS: Option in profile settings to delete the account of the currently logged in user.
-#, fuzzy
 msgid "Delete account"
-msgstr "Criar uma conta"
+msgstr "Apagar conta"
 
 #. TRANS: Form text for user deletion form.
 msgid ""
 "This will <strong>permanently delete</strong> your account data from this "
 "server."
 msgstr ""
+"Isso <strong>vai apagar</strong> os dados da tua conta a partir deste "
+"servidor."
 
 #. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
 #. TRANS: %s is a URL to the backup page.
@@ -1529,6 +1481,7 @@ msgid ""
 "You are strongly advised to <a href=\"%s\">back up your data</a> before "
 "deletion."
 msgstr ""
+"Aconselhamos a <a href=\"%s\">fazer backup dos dados</a> antes de apagares."
 
 #. TRANS: Field label for delete account confirmation entry.
 #. TRANS: Field label for password reset form where the password has to be typed again.
@@ -1537,14 +1490,13 @@ msgstr "Confirmação"
 
 #. TRANS: Input title for the delete account field.
 #. TRANS: %s is the text that needs to be input.
-#, fuzzy, php-format
+#, php-format
 msgid "Enter \"%s\" to confirm that you want to delete your account."
-msgstr "Não pode apagar utilizadores."
+msgstr "Coloca \"%s\" para confirmar que desejas apagar a tua conta."
 
 #. TRANS: Button title for user account deletion.
-#, fuzzy
 msgid "Permanently delete your account"
-msgstr "Não pode apagar utilizadores."
+msgstr "Apagar permanentemente a tua conta"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
 msgid "You must be logged in to delete an application."
@@ -1579,19 +1531,16 @@ msgstr ""
 "utilizadores em existência."
 
 #. TRANS: Submit button title for 'No' when deleting an application.
-#, fuzzy
 msgid "Do not delete this application."
-msgstr "Não apagar esta aplicação"
+msgstr "Não apagues essa aplicação."
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
-#, fuzzy
 msgid "Delete this application."
-msgstr "Apagar esta aplicação"
+msgstr "Apagar esta aplicação."
 
 #. TRANS: Client error when trying to delete group while not logged in.
-#, fuzzy
 msgid "You must be logged in to delete a group."
-msgstr "Tem de iniciar uma sessão para deixar um grupo."
+msgstr "Precisas estar logado para excluir um grupo."
 
 #. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
 #. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
@@ -1600,47 +1549,43 @@ msgid "No nickname or ID."
 msgstr "Nenhum utilizador ou ID."
 
 #. TRANS: Client error when trying to delete a group without having the rights to delete it.
-#, fuzzy
 msgid "You are not allowed to delete this group."
-msgstr "Não é membro deste grupo."
+msgstr "Não tens permissão para apagar este grupo."
 
 #. TRANS: Server error displayed if a group could not be deleted.
 #. TRANS: %s is the name of the group that could not be deleted.
-#, fuzzy, php-format
+#, php-format
 msgid "Could not delete group %s."
-msgstr "Não foi possível actualizar o grupo."
+msgstr "Não foi possível apagar o grupo %s."
 
 #. TRANS: Message given after deleting a group.
 #. TRANS: %s is the deleted group's name.
-#, fuzzy, php-format
+#, php-format
 msgid "Deleted group %s"
-msgstr "%1$s deixou o grupo %2$s"
+msgstr "Grupo %s apagado"
 
 #. TRANS: Title of delete group page.
 #. TRANS: Form legend for deleting a group.
-#, fuzzy
 msgid "Delete group"
-msgstr "Apagar utilizador"
+msgstr "Apagar grupo"
 
 #. TRANS: Warning in form for deleleting a group.
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this group? This will clear all data about "
 "the group from the database, without a backup. Public posts to this group "
 "will still appear in individual timelines."
 msgstr ""
-"Tem a certeza de que quer apagar este utilizador? Todos os dados do "
-"utilizador serão eliminados da base de dados, sem haver cópias."
+"Tens certeza de que desejas apagar este grupo? Isto irá limpar todos os "
+"dados sobre o grupo do banco de dados sem um backup. Postagens públicas "
+"deste grupo ainda vão aparecer em cronogramas individuais."
 
 #. TRANS: Submit button title for 'No' when deleting a group.
-#, fuzzy
 msgid "Do not delete this group."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues este grupo."
 
 #. TRANS: Submit button title for 'Yes' when deleting a group.
-#, fuzzy
 msgid "Delete this group."
-msgstr "Apagar este utilizador"
+msgstr "Apagar este grupo."
 
 #. TRANS: Error message displayed trying to delete a notice while not logged in.
 #. TRANS: Client error displayed when trying to remove a favorite while not logged in.
@@ -1677,14 +1622,12 @@ msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza de que quer apagar esta nota?"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
-#, fuzzy
 msgid "Do not delete this notice."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues esta nota."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#, fuzzy
 msgid "Delete this notice."
-msgstr "Apagar esta nota"
+msgstr "Apagar esta nota."
 
 #. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
 msgid "You cannot delete users."
@@ -1695,7 +1638,6 @@ msgid "You can only delete local users."
 msgstr "Só pode apagar utilizadores locais."
 
 #. TRANS: Title of delete user page.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Delete user"
 msgstr "Apagar utilizador"
@@ -1713,14 +1655,12 @@ msgstr ""
 "utilizador serão eliminados da base de dados, sem haver cópias."
 
 #. TRANS: Submit button title for 'No' when deleting a user.
-#, fuzzy
 msgid "Do not delete this user."
-msgstr "Não apagar esta nota"
+msgstr "Não apagues este utilizador."
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
-#, fuzzy
 msgid "Delete this user."
-msgstr "Apagar este utilizador"
+msgstr "Apagar este utilizador."
 
 #. TRANS: Message used as title for design settings for the site.
 msgid "Design"
@@ -1735,9 +1675,8 @@ msgid "Invalid logo URL."
 msgstr "URL do logotipo inválida."
 
 #. TRANS: Client error displayed when an SSL logo URL is invalid.
-#, fuzzy
 msgid "Invalid SSL logo URL."
-msgstr "URL do logotipo inválida."
+msgstr "URL SSL do logotipo inválido."
 
 #. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
 #. TRANS: %s is the chosen unavailable theme.
@@ -1754,9 +1693,8 @@ msgid "Site logo"
 msgstr "Logotipo do site"
 
 #. TRANS: Field label for SSL StatusNet site logo.
-#, fuzzy
 msgid "SSL logo"
-msgstr "Logotipo do site"
+msgstr "Logótipo SSL"
 
 #. TRANS: Fieldset legend for form change StatusNet site's theme.
 msgid "Change theme"
@@ -1819,7 +1757,6 @@ msgid "Tile background image"
 msgstr "Repetir imagem de fundo em mosaico"
 
 #. TRANS: Fieldset legend for theme colors.
-#, fuzzy
 msgid "Change colors"
 msgstr "Alterar cores"
 
@@ -1852,25 +1789,21 @@ msgid "Custom CSS"
 msgstr "CSS personalizado"
 
 #. TRANS: Button text for resetting theme settings.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Use defaults"
-msgstr "Usar predefinições"
+msgstr "Usar padrão"
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Restore default designs."
-msgstr "Repor estilos predefinidos"
+msgstr "Restaurar designs padrão."
 
 #. TRANS: Title for button for resetting theme settings.
-#, fuzzy
 msgid "Reset back to default."
-msgstr "Repor predefinição"
+msgstr "Repor para o padrão."
 
 #. TRANS: Title for button for saving theme settings.
-#, fuzzy
 msgid "Save design."
-msgstr "Gravar o estilo"
+msgstr "Salvar o design."
 
 #. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
 msgid "This notice is not a favorite!"
@@ -1882,9 +1815,9 @@ msgstr "Adicionar às favoritas"
 
 #. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
 #. TRANS: %s is the non-existing document.
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\"."
-msgstr "Documento \"%s\" não foi encontrado"
+msgstr "Documento \"%s\" não foi encontrado."
 
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
@@ -1910,7 +1843,6 @@ msgstr "Nome é obrigatório."
 
 #. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
 #. TRANS: Validation error shown when providing too long a name in the "New application" form.
-#, fuzzy
 msgid "Name is too long (maximum 255 characters)."
 msgstr "Nome é demasiado longo (máx. 255 caracteres)."
 
@@ -2180,7 +2112,6 @@ msgstr "Sem endereço electrónico de entrada."
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #. TRANS: Server error displayed when the user could not be updated in SMS settings.
-#, fuzzy
 msgid "Could not update user record."
 msgstr "Não foi possível actualizar o registo do utilizador."
 
@@ -2199,9 +2130,8 @@ msgid "This notice is already a favorite!"
 msgstr "Esta nota já é uma favorita!"
 
 #. TRANS: Page title for page on which favorite notices can be unfavourited.
-#, fuzzy
 msgid "Disfavor favorite."
-msgstr "Retirar das favoritas"
+msgstr "Retirar dos favoritos."
 
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
@@ -2501,7 +2431,7 @@ msgstr "Bloquear"
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
 msgid "Block this user"
-msgstr ""
+msgstr "Bloquear este utilizador"
 
 #. TRANS: Form legend for form to make a user a group admin.
 msgid "Make user an admin of the group"
@@ -2523,14 +2453,13 @@ msgid "Updates from members of %1$s on %2$s!"
 msgstr "Actualizações dos membros de %1$s em %2$s!"
 
 #. TRANS: Title for first page of the groups list.
-#, fuzzy
 msgctxt "TITLE"
 msgid "Groups"
 msgstr "Grupos"
 
 #. TRANS: Title for all but the first page of the groups list.
 #. TRANS: %d is the page number.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "Groups, page %d"
 msgstr "Grupos, página %d"
@@ -2650,14 +2579,12 @@ msgid "%s screenname."
 msgstr ""
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
-msgstr "Preferências de MI"
+msgstr "Preferências IM"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Enviar uma nota"
+msgstr "Enviar-me avisos"
 
 #. TRANS: Checkbox label in IM preferences form.
 #, fuzzy
@@ -2689,9 +2616,8 @@ msgstr "Preferências gravadas."
 msgid "No screenname."
 msgstr "Nome de utilizador não definido."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Sem nota."
+msgstr "Sem transporte."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 #, fuzzy
@@ -2780,7 +2706,6 @@ msgid "Invalid email address: %s."
 msgstr "Endereço electrónico inválido: %s"
 
 #. TRANS: Page title when invitations have been sent.
-#, fuzzy
 msgid "Invitations sent"
 msgstr "Convite(s) enviado(s)"
 
@@ -2792,15 +2717,14 @@ msgstr "Convidar novos utilizadores"
 #. TRANS: is already subscribed to one or more users with the given e-mail address(es).
 #. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
 #. TRANS: Followed by a bullet list.
-#, fuzzy
 msgid "You are already subscribed to this user:"
 msgid_plural "You are already subscribed to these users:"
 msgstr[0] "Já subscreveu estes utilizadores:"
-msgstr[1] "Já subscreveu estes utilizadores:"
+msgstr[1] "Já subscreves-te a estes utilizadores:"
 
 #. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
 #. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).
-#, fuzzy, php-format
+#, php-format
 msgctxt "INVITE"
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2936,7 +2860,7 @@ msgid "You must be logged in to join a group."
 msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
 
 #. TRANS: Title for join group page after joining.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
@@ -2951,7 +2875,7 @@ msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
 #. TRANS: Title for leave group page after leaving.
-#, fuzzy, php-format
+#, php-format
 msgctxt "TITLE"
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2959,7 +2883,7 @@ msgstr "%1$s deixou o grupo %2$s"
 #. TRANS: User admin panel title
 msgctxt "TITLE"
 msgid "License"
-msgstr ""
+msgstr "Licença"
 
 #. TRANS: Form instructions for the site license admin panel.
 msgid "License for this StatusNet site"
@@ -3006,7 +2930,7 @@ msgstr "Privado"
 
 #. TRANS: License option in the license admin panel.
 msgid "All Rights Reserved"
-msgstr ""
+msgstr "Todos os Direitos Reservados"
 
 #. TRANS: License option in the license admin panel.
 msgid "Creative Commons"
@@ -3014,20 +2938,19 @@ msgstr ""
 
 #. TRANS: Dropdown field label in the license admin panel.
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Seleccione um operador"
+msgstr "Selecciona uma licença."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
-msgstr ""
+msgstr "Detalhes da licença"
 
 #. TRANS: Field label in the license admin panel.
 msgid "Owner"
-msgstr ""
+msgstr "Proprietário"
 
 #. TRANS: Field title in the license admin panel.
 msgid "Name of the owner of the site's content (if applicable)."
@@ -3035,7 +2958,7 @@ msgstr ""
 
 #. TRANS: Field label in the license admin panel.
 msgid "License Title"
-msgstr ""
+msgstr "Título da Licença"
 
 #. TRANS: Field title in the license admin panel.
 msgid "The title of the license."
@@ -3095,10 +3018,9 @@ msgstr ""
 "partilhados!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
-msgstr "Entrar"
+msgstr "Iniciar sessão"
 
 #. TRANS: Link text for link to "reset password" on login page.
 msgid "Lost or forgotten password?"
@@ -3154,7 +3076,7 @@ msgstr "Sem estado actual."
 #. TRANS: This is the title of the form for adding a new application.
 #, fuzzy
 msgid "New application"
-msgstr "Aplicação Nova"
+msgstr "Nova aplicação"
 
 #. TRANS: Client error displayed trying to add a new application while not logged in.
 msgid "You must be logged in to register an application."
@@ -3285,9 +3207,9 @@ msgstr "Actualizações com \"%s\""
 
 #. TRANS: RSS notice search feed description.
 #. TRANS: %1$s is the query, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s."
-msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s!"
+msgstr "Actualizações que contêm o termo \"%1$s\" em %2$s."
 
 #. TRANS: Client error displayed trying to nudge a user that cannot be nudged.
 #, fuzzy
@@ -3337,9 +3259,9 @@ msgstr "Não é utilizador dessa aplicação."
 
 #. TRANS: Client error when revoking access has failed for some reason.
 #. TRANS: %s is the application ID revoking access failed for.
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for application: %s."
-msgstr "Não foi possível retirar acesso da aplicação: %s"
+msgstr "Não foi possível retirar acesso da aplicação: %s."
 
 #. TRANS: Success message after revoking access for an application.
 #. TRANS: %1$s is the application name, %2$s is the first part of the user token.
@@ -3471,14 +3393,12 @@ msgstr "Antiga"
 msgid "New password"
 msgstr "Nova"
 
-#, fuzzy
 msgid "6 or more characters."
-msgstr "6 ou mais caracteres"
+msgstr "6 ou mais caracteres."
 
 #. TRANS: Ttile for field label for password reset form where the password has to be typed again.
-#, fuzzy
 msgid "Same as password above."
-msgstr "Repita a senha nova"
+msgstr "Repita a nova senha."
 
 msgid "Change"
 msgstr "Modificar"
@@ -3496,9 +3416,8 @@ msgid "Error saving user; invalid."
 msgstr "Erro ao guardar utilizador; inválido."
 
 #. TRANS: Reset password form validation error message.
-#, fuzzy
 msgid "Cannot save new password."
-msgstr "Não é possível guardar a nova senha."
+msgstr "Não é possível salvar a nova senha."
 
 msgid "Password saved."
 msgstr "Senha gravada."
@@ -3556,14 +3475,12 @@ msgstr "Nome do servidor do site."
 msgid "Path"
 msgstr "Localização"
 
-#, fuzzy
 msgid "Site path."
-msgstr "Localização do site"
+msgstr "Localização do site."
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "Locale directory"
-msgstr "Directório do tema"
+msgstr "Directório local"
 
 #, fuzzy
 msgid "Directory path to locales."
@@ -3580,9 +3497,8 @@ msgid "Theme"
 msgstr "Tema"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for themes."
-msgstr "O tema para o site."
+msgstr "Servidor para temas."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to themes."
@@ -3597,9 +3513,8 @@ msgid "SSL server for themes (default: SSL server)."
 msgstr ""
 
 #. TRANS: Field label in Paths admin panel.
-#, fuzzy
 msgid "SSL path"
-msgstr "Localização do site"
+msgstr "Localização SSL"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "SSL path to themes (default: /theme/)."
@@ -3633,9 +3548,8 @@ msgid "Avatar path"
 msgstr "Localização do avatar"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Web path to avatars."
-msgstr "Falha ao actualizar avatar."
+msgstr "Localização dos avatares na Web."
 
 #. TRANS: Field label in Paths admin panel.
 msgid "Avatar directory"
@@ -3651,9 +3565,8 @@ msgid "Backgrounds"
 msgstr "Fundos"
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for backgrounds."
-msgstr "O tema para o site."
+msgstr "Servidor para os fundos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to backgrounds."
@@ -3687,9 +3600,8 @@ msgid "Web path to attachments."
 msgstr "Sem anexos."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
-#, fuzzy
 msgid "Server for attachments on SSL pages."
-msgstr "O tema para o site."
+msgstr "Servidor para anexos nas páginas SSL."
 
 #. TRANS: Tooltip for field label in Paths admin panel.
 msgid "Web path to attachments on SSL pages."
@@ -3759,7 +3671,7 @@ msgstr "Utilizadores auto-categorizados com %1$s - página %2$d"
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Desabilitado"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
@@ -3777,7 +3689,7 @@ msgstr "Página não foi encontrada."
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Habilitado"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3792,9 +3704,8 @@ msgid ""
 msgstr ""
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Língua, por omissão"
+msgstr "Plugins padrão"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
@@ -3890,9 +3801,8 @@ msgid "Language"
 msgstr "Língua"
 
 #. TRANS: Tooltip for dropdown list label in form for profile settings.
-#, fuzzy
 msgid "Preferred language."
-msgstr "Língua preferida"
+msgstr "Língua preferida."
 
 #. TRANS: Dropdownlist label in form for profile settings.
 msgid "Timezone"
@@ -4024,7 +3934,7 @@ msgstr ""
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, fuzzy, php-format
 msgid "%s updates from everyone."
-msgstr "%s actualizações de todos!"
+msgstr "%s actualizações de todos."
 
 #. TRANS: Title for public tag cloud.
 msgid "Public tag cloud"
@@ -4120,7 +4030,6 @@ msgid "Recover"
 msgstr "Recuperar"
 
 #. TRANS: Button text on password recovery page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Recover"
 msgstr "Recuperar"
@@ -4139,9 +4048,8 @@ msgid "Password recovery requested"
 msgstr "Solicitada recuperação da senha"
 
 #. TRANS: Title for password recovery page in password saved mode.
-#, fuzzy
 msgid "Password saved"
-msgstr "Senha gravada."
+msgstr "Senha gravada"
 
 #. TRANS: Title for password recovery page when an unknown action has been specified.
 msgid "Unknown action"
@@ -4209,9 +4117,9 @@ msgstr "A senha nova foi gravada com sucesso. Iniciou uma sessão."
 msgid "No id parameter"
 msgstr "Argumento de identificação (ID) em falta."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Ficheiro não foi encontrado."
+msgstr "O ficheiro \"%d\" não foi encontrado."
 
 msgid "Sorry, only invited people can register."
 msgstr "Desculpe, só pessoas convidadas se podem registar."
@@ -4448,9 +4356,9 @@ msgstr ""
 
 #. TRANS: RSS reply feed description.
 #. TRANS: %1$s is a user nickname, %2$s is the StatusNet site name.
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s."
-msgstr "Respostas a %1$s em %2$s!"
+msgstr "Respostas a %1$s em %2$s."
 
 #. TRANS: Client exception displayed when trying to restore an account while not logged in.
 #, fuzzy
@@ -4464,9 +4372,8 @@ msgstr "Ainda não registou nenhuma aplicação."
 
 #. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
 #. TRANS: Client exception. No file; probably just a non-AJAX submission.
-#, fuzzy
 msgid "No uploaded file."
-msgstr "Carregar ficheiro"
+msgstr "Nenhum ficheiro carregado."
 
 #. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -4727,13 +4634,11 @@ msgstr "Todos os membros"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#, fuzzy
 msgctxt "LABEL"
 msgid "Created"
 msgstr "Criado"
 
 #. TRANS: Label for member count in statistics on group page.
-#, fuzzy
 msgctxt "LABEL"
 msgid "Members"
 msgstr "Membros"
@@ -4800,9 +4705,9 @@ msgid "Notice deleted."
 msgstr "Avatar actualizado."
 
 #. TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag.
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s tagged %2$s"
-msgstr "%1$s, página %2$d"
+msgstr "%1$s etiquetado como %2$s"
 
 #. TRANS: Page title showing tagged notices in one user's stream.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
@@ -5139,9 +5044,8 @@ msgstr ""
 "para %s."
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#, fuzzy
 msgid "No code entered."
-msgstr "Nenhum código introduzido"
+msgstr "Nenhum código introduzido."
 
 #. TRANS: Menu item for site administration
 msgid "Snapshots"
@@ -5403,12 +5307,11 @@ msgstr "Gerir várias outras opções."
 msgid " (free service)"
 msgstr " (serviço livre)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "Nenhum"
+msgstr "[nenhum]"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[interno]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5535,7 +5438,6 @@ msgstr ""
 "as notas de alguém, simplesmente clique \"Rejeitar\"."
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Accept"
 msgstr "Aceitar"
@@ -5546,7 +5448,6 @@ msgid "Subscribe to this user."
 msgstr "Subscrever este utilizador"
 
 #. TRANS: Button text on Authorise Subscription page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reject"
 msgstr "Rejeitar"
@@ -5663,9 +5564,8 @@ msgstr "Ver estilos para o perfil"
 msgid "Show or hide profile designs."
 msgstr "Mostrar ou esconder estilos para o perfil."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Fundo"
+msgstr "Ficheiro de fundo"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -6066,7 +5966,7 @@ msgstr "Página sem título"
 #. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
 msgctxt "TOOLTIP"
 msgid "Show more"
-msgstr ""
+msgstr "Mostrar mais"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
 #, fuzzy
@@ -6076,86 +5976,11 @@ msgstr "Responder"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Página pessoal"
+msgstr "Escrever uma resposta..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Notas de %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Procurar pessoas neste site"
-
-#, fuzzy
-msgid "Settings"
-msgstr "Configurações de SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Modificar as suas definições de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuração do utilizador"
-
-msgid "Logout"
-msgstr "Sair"
-
-msgid "Logout from the site"
-msgstr "Terminar esta sessão"
-
-msgid "Login to the site"
-msgstr "Iniciar uma sessão"
-
-msgid "Search"
-msgstr "Pesquisa"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Pesquisar site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termos"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidade"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Código fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contacto"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Emblema"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6260,9 +6085,8 @@ msgid "Remote profile is not a group!"
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
-#, fuzzy
 msgid "User is already a member of this group."
-msgstr "Já é membro desse grupo."
+msgstr "O utilizador já é membro deste grupo."
 
 #. TRANS: Client exception thrown when trying to import a notice by another user.
 #. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
@@ -6280,9 +6104,9 @@ msgstr ""
 msgid "No content for notice %s."
 msgstr "Procurar no conteúdo das notas"
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such user %s."
-msgstr "Utilizador não foi encontrado."
+msgstr "Utilizador %s não foi encontrado."
 
 #. TRANS: Client exception thrown when post to collection fails with a 400 status.
 #. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
@@ -6381,12 +6205,11 @@ msgstr "Configuração dos instântaneos"
 
 #. TRANS: Menu item title/tooltip
 msgid "Set site license"
-msgstr ""
+msgstr "Conjunto de licenças do site"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Configuração das localizações"
+msgstr "Configuração dos plugins"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6428,16 +6251,16 @@ msgid ""
 msgstr ""
 
 #. TRANS: Exception thrown when no access token can be issued.
-#, fuzzy
 msgid "Could not issue access token."
-msgstr "Não foi possível inserir a mensagem."
+msgstr "Não foi possível emitir a ficha de acesso."
 
 msgid "Database error inserting OAuth application user."
 msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
 
-#, fuzzy
 msgid "Database error updating OAuth application user."
-msgstr "Erro na base de dados ao inserir o utilizador da aplicação OAuth."
+msgstr ""
+"Erro na actualização da base de dados ao inserir o utilizador da aplicação "
+"OAuth."
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 msgid "Tried to revoke unknown token."
@@ -6520,7 +6343,7 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 msgid " by "
-msgstr ""
+msgstr "por "
 
 #. TRANS: Application access type
 msgid "read-write"
@@ -6955,6 +6778,12 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro de base de dados"
 
+msgid "Home"
+msgstr "Página pessoal"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Apagar este utilizador"
@@ -7632,6 +7461,18 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
+msgid "Inbox"
+msgstr "Recebidas"
+
+msgid "Your incoming messages"
+msgstr "Mensagens recebidas"
+
+msgid "Outbox"
+msgstr "Enviadas"
+
+msgid "Your sent messages"
+msgstr "Mensagens enviadas"
+
 msgid "Could not parse message."
 msgstr "Não foi possível fazer a análise sintáctica da mensagem."
 
@@ -7712,6 +7553,20 @@ msgstr "Mensagem"
 msgid "from"
 msgstr "a partir de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Não tens permissão para apagar este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Não apagues este utilizador."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7826,24 +7681,16 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir nova subscrição."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritas"
 
-msgid "Inbox"
-msgstr "Recebidas"
-
-msgid "Your incoming messages"
-msgstr "Mensagens recebidas"
-
-msgid "Outbox"
-msgstr "Enviadas"
-
-msgid "Your sent messages"
-msgstr "Mensagens enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7867,6 +7714,32 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configurações"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Modificar as suas definições de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do utilizador"
+
+msgid "Logout"
+msgstr "Sair"
+
+msgid "Logout from the site"
+msgstr "Terminar esta sessão"
+
+msgid "Login to the site"
+msgstr "Iniciar uma sessão"
+
+msgid "Search"
+msgstr "Pesquisa"
+
+msgid "Search the site"
+msgstr "Pesquisar no site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7976,6 +7849,39 @@ msgstr "Procurar no conteúdo das notas"
 msgid "Find groups on this site"
 msgstr "Procurar grupos neste site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Sobre"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termos"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidade"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Código fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contacto"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Emblema"
+
 msgid "Untitled section"
 msgstr "Secção sem título"
 
@@ -8262,19 +8168,9 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "descrição é demasiada extensa (máx. %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Localidade demasiado longa (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Demasiados nomes alternativos! Máx. %d."
-
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Conteúdo"
+#~ msgid "Friends timeline"
+#~ msgstr "Notas de %s"
+
+#~ msgid "Everyone on this site"
+#~ msgstr "Todos neste site"
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index d6d5363303..ade9fcc57c 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:36+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:29+0000\n"
 "Language-Team: Brazilian Portuguese <http://translatewiki.net/wiki/Portal:pt-"
 "br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6045,82 +6045,9 @@ msgstr "Responder"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Site"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Mensagens de %s"
-
-msgid "Your profile"
-msgstr "Perfil do grupo"
-
-msgid "Public"
-msgstr "Público"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Encontre pessoas neste site"
-
-msgid "Settings"
-msgstr "Configuração do SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Alterar as suas configurações de perfil"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Configuração do usuário"
-
-msgid "Logout"
-msgstr "Sair"
-
-msgid "Logout from the site"
-msgstr "Sai do site"
-
-msgid "Login to the site"
-msgstr "Autentique-se no site"
-
-msgid "Search"
-msgstr "Pesquisar"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Procurar no site"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Ajuda"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Sobre"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Termos de uso"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Privacidade"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Fonte"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Contato"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Mini-aplicativo"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6929,6 +6856,12 @@ msgstr "Ir para o instalador."
 msgid "Database error"
 msgstr "Erro no banco de dados"
 
+msgid "Home"
+msgstr "Site"
+
+msgid "Public"
+msgstr "Público"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Excluir este usuário"
@@ -7610,6 +7543,18 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
+msgid "Inbox"
+msgstr "Recebidas"
+
+msgid "Your incoming messages"
+msgstr "Suas mensagens recebidas"
+
+msgid "Outbox"
+msgstr "Enviadas"
+
+msgid "Your sent messages"
+msgstr "Suas mensagens enviadas"
+
 msgid "Could not parse message."
 msgstr "Não foi possível analisar a mensagem."
 
@@ -7690,6 +7635,20 @@ msgstr "Mensagem"
 msgid "from"
 msgstr "de"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Você não tem permissão para excluir este grupo."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Não excluir este grupo"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7804,24 +7763,15 @@ msgstr "Nota duplicada."
 msgid "Couldn't insert new subscription."
 msgstr "Não foi possível inserir a nova assinatura."
 
+msgid "Your profile"
+msgstr "Perfil do grupo"
+
 msgid "Replies"
 msgstr "Respostas"
 
 msgid "Favorites"
 msgstr "Favoritos"
 
-msgid "Inbox"
-msgstr "Recebidas"
-
-msgid "Your incoming messages"
-msgstr "Suas mensagens recebidas"
-
-msgid "Outbox"
-msgstr "Enviadas"
-
-msgid "Your sent messages"
-msgstr "Suas mensagens enviadas"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7845,6 +7795,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Configuração do SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Alterar as suas configurações de perfil"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Configuração do usuário"
+
+msgid "Logout"
+msgstr "Sair"
+
+msgid "Logout from the site"
+msgstr "Sai do site"
+
+msgid "Login to the site"
+msgstr "Autentique-se no site"
+
+msgid "Search"
+msgstr "Pesquisar"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Procurar no site"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7954,6 +7931,39 @@ msgstr "Encontre conteúdo de mensagens"
 msgid "Find groups on this site"
 msgstr "Encontre grupos neste site"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Ajuda"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Sobre"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Termos de uso"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Privacidade"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Fonte"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Contato"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Mini-aplicativo"
+
 msgid "Untitled section"
 msgstr "Seção sem título"
 
@@ -8238,19 +8248,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Nome completo muito extenso (máx. 255 caracteres)"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "descrição muito extensa (máximo %d caracteres)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Localização muito extensa (máx. 255 caracteres)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Muitos apelidos! O máximo são %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Mensagens de %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Conteúdo"
+#~ msgid "Everyone on this site"
+#~ msgstr "Encontre pessoas neste site"
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index f06b0313e5..e3319efb95 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -18,18 +18,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:37+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:30+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -1324,7 +1324,7 @@ msgstr ""
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Backup"
-msgstr "Фон"
+msgstr "Создать резервную копию"
 
 #. TRANS: Title for submit button to backup an account on the backup account page.
 #, fuzzy
@@ -6043,83 +6043,9 @@ msgstr "Ответить"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Главная"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "Лента %s"
-
-#, fuzzy
-msgid "Your profile"
-msgstr "Профиль группы"
-
-msgid "Public"
-msgstr "Общее"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Найти человека на этом сайте"
-
-msgid "Settings"
-msgstr "Установки СМС"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Изменить ваши настройки профиля"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Конфигурация пользователя"
-
-msgid "Logout"
-msgstr "Выход"
-
-msgid "Logout from the site"
-msgstr "Выйти"
-
-msgid "Login to the site"
-msgstr "Войти"
-
-msgid "Search"
-msgstr "Поиск"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Поиск по сайту"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Помощь"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "О проекте"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧаВо"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "TOS"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Пользовательское соглашение"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Исходный код"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контактная информация"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Бедж"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6924,6 +6850,12 @@ msgstr "Перейти к установщику"
 msgid "Database error"
 msgstr "Ошибка базы данных"
 
+msgid "Home"
+msgstr "Главная"
+
+msgid "Public"
+msgstr "Общее"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Удалить этого пользователя"
@@ -7608,6 +7540,18 @@ msgstr ""
 "вовлечения других пользователей в разговор. Сообщения, получаемые от других "
 "людей, видите только вы."
 
+msgid "Inbox"
+msgstr "Входящие"
+
+msgid "Your incoming messages"
+msgstr "Ваши входящие сообщения"
+
+msgid "Outbox"
+msgstr "Исходящие"
+
+msgid "Your sent messages"
+msgstr "Ваши исходящие сообщения"
+
 msgid "Could not parse message."
 msgstr "Сообщение не удаётся разобрать."
 
@@ -7686,6 +7630,20 @@ msgstr "Сообщение"
 msgid "from"
 msgstr "от"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Вы не можете удалить эту группу."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не удаляйте эту группу"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Псевдоним не может быть пустым."
@@ -7801,24 +7759,16 @@ msgstr "Дублирующаяся запись."
 msgid "Couldn't insert new subscription."
 msgstr "Не удаётся вставить новую подписку."
 
+#, fuzzy
+msgid "Your profile"
+msgstr "Профиль группы"
+
 msgid "Replies"
 msgstr "Ответы"
 
 msgid "Favorites"
 msgstr "Любимое"
 
-msgid "Inbox"
-msgstr "Входящие"
-
-msgid "Your incoming messages"
-msgstr "Ваши входящие сообщения"
-
-msgid "Outbox"
-msgstr "Исходящие"
-
-msgid "Your sent messages"
-msgstr "Ваши исходящие сообщения"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7842,6 +7792,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Установки СМС"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Изменить ваши настройки профиля"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Конфигурация пользователя"
+
+msgid "Logout"
+msgstr "Выход"
+
+msgid "Logout from the site"
+msgstr "Выйти"
+
+msgid "Login to the site"
+msgstr "Войти"
+
+msgid "Search"
+msgstr "Поиск"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Поиск по сайту"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7950,6 +7927,39 @@ msgstr "Найти запись по содержимому"
 msgid "Find groups on this site"
 msgstr "Найти группы на этом сайте"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Помощь"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "О проекте"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧаВо"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "TOS"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Пользовательское соглашение"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Исходный код"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контактная информация"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Бедж"
+
 msgid "Untitled section"
 msgstr "Секция без названия"
 
@@ -8242,19 +8252,10 @@ msgstr "Неверный XML, отсутствует корень XRD."
 msgid "Getting backup from file '%s'."
 msgstr "Получение резервной копии из файла «%s»."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Полное имя слишком длинное (максимум 255 символов)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Слишком длинное описание (максимум %d символов)"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Слишком длинное месторасположение (максимум 255 символов)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Слишком много алиасов! Максимальное число — %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "Лента %s"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Содержание"
+#~ msgid "Everyone on this site"
+#~ msgstr "Найти человека на этом сайте"
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 4f043edeb4..81cdbaba1e 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-08 01:03+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"
@@ -19,7 +19,7 @@ msgstr ""
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:53 lib/adminpanelaction.php:363
+#: actions/accessadminpanel.php:53 lib/adminpanelnav.php:92
 msgid "Access"
 msgstr ""
 
@@ -174,9 +174,9 @@ msgstr ""
 #. TRANS: H1 text for page. %s is a user nickname.
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Timeline title for user and friends. %s is a user nickname.
-#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
+#: actions/all.php:94 actions/all.php:185 actions/allrss.php:117
 #: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:100
+#: lib/personalgroupnav.php:72
 #, php-format
 msgid "%s and friends"
 msgstr ""
@@ -200,7 +200,7 @@ msgid "Feed for friends of %s (Atom)"
 msgstr ""
 
 #. TRANS: Empty list message. %s is a user nickname.
-#: actions/all.php:139
+#: actions/all.php:133
 #, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
@@ -208,7 +208,7 @@ msgstr ""
 
 #. TRANS: Encouragement displayed on logged in user's empty timeline.
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:146
+#: actions/all.php:140
 #, php-format
 msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
@@ -217,7 +217,7 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
 #. TRANS: This message contains Markdown links. Keep "](" together.
-#: actions/all.php:150
+#: actions/all.php:144
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
@@ -228,7 +228,7 @@ msgstr ""
 #. TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
 #. TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#: actions/all.php:155 actions/replies.php:210 actions/showstream.php:221
+#: actions/all.php:149 actions/replies.php:198 actions/showstream.php:221
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -236,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: H1 text for page when viewing a list for self.
-#: actions/all.php:188
+#: actions/all.php:182
 msgid "You and friends"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgstr[1] ""
 #: actions/apiaccountupdateprofilebackgroundimage.php:149
 #: actions/apiaccountupdateprofilecolors.php:160
 #: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
+#: actions/groupdesignsettings.php:295 actions/groupdesignsettings.php:306
 #: actions/userdesignsettings.php:218 actions/userdesignsettings.php:228
 #: actions/userdesignsettings.php:270 actions/userdesignsettings.php:280
 msgid "Unable to save your design settings."
@@ -943,7 +943,7 @@ msgstr ""
 #. TRANS: Field label on OAuth API authorisation form.
 #. TRANS: Field label on login page.
 #: actions/apioauthauthorize.php:463 actions/login.php:235
-#: actions/register.php:415 lib/settingsnav.php:87
+#: actions/register.php:415 lib/settingsnav.php:74
 msgid "Password"
 msgstr ""
 
@@ -1505,7 +1505,7 @@ msgid "Invalid size."
 msgstr ""
 
 #. TRANS: Title for avatar upload page.
-#: actions/avatarsettings.php:66 lib/settingsnav.php:82
+#: actions/avatarsettings.php:66 lib/settingsnav.php:69
 msgid "Avatar"
 msgstr ""
 
@@ -1809,7 +1809,7 @@ msgstr ""
 #. TRANS: Header on conversation page. Hidden by default (h2).
 #. TRANS: Label for user statistics.
 #: actions/conversation.php:149 lib/noticelist.php:87
-#: lib/profileaction.php:246 lib/searchgroupnav.php:82
+#: lib/profileaction.php:246 lib/searchgroupnav.php:78
 #: lib/threadednoticelist.php:66
 msgid "Notices"
 msgstr ""
@@ -1902,7 +1902,7 @@ msgstr ""
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:131
 #: actions/newapplication.php:112 actions/showapplication.php:113
-#: lib/action.php:1397
+#: lib/action.php:1388
 msgid "There was a problem with your session token."
 msgstr ""
 
@@ -2077,7 +2077,7 @@ msgid "Delete this user."
 msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
-#: actions/designadminpanel.php:60 lib/settingsnav.php:97
+#: actions/designadminpanel.php:60 lib/settingsnav.php:84
 msgid "Design"
 msgstr ""
 
@@ -2636,7 +2636,7 @@ msgstr ""
 #. TRANS: Page title for first page of favorited notices.
 #. TRANS: Title for favourited notices section.
 #: actions/favorited.php:65 lib/popularnoticesection.php:62
-#: lib/publicgroupnav.php:93
+#: lib/publicgroupnav.php:79
 msgid "Popular notices"
 msgstr ""
 
@@ -2678,7 +2678,7 @@ msgstr ""
 #. TRANS: Title for first page of favourite notices of a user.
 #. TRANS: %s is the user for whom the favourite notices are displayed.
 #: actions/favoritesrss.php:111 actions/showfavorites.php:76
-#: lib/personalgroupnav.php:110
+#: lib/personalgroupnav.php:88
 #, php-format
 msgid "%s's favorite notices"
 msgstr ""
@@ -2693,7 +2693,7 @@ msgstr ""
 #. TRANS: Page title for first page of featured users.
 #. TRANS: Title for featured users section.
 #: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
+#: lib/publicgroupnav.php:75
 msgid "Featured users"
 msgstr ""
 
@@ -2705,7 +2705,7 @@ msgid "Featured users, page %d"
 msgstr ""
 
 #. TRANS: Description on page displaying featured users.
-#: actions/featured.php:102
+#: actions/featured.php:96
 #, php-format
 msgid "A selection of some great users on %s."
 msgstr ""
@@ -2901,12 +2901,12 @@ msgid ""
 msgstr ""
 
 #. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
-#: actions/groupdesignsettings.php:262
+#: actions/groupdesignsettings.php:272
 msgid "Unable to update your design settings."
 msgstr ""
 
 #. TRANS: Form text to confirm saved group design settings.
-#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:239
+#: actions/groupdesignsettings.php:317 actions/userdesignsettings.php:239
 msgid "Design preferences saved."
 msgstr ""
 
@@ -2969,7 +2969,7 @@ msgid "A list of the users in this group."
 msgstr ""
 
 #. TRANS: Indicator in group members list that this user is a group administrator.
-#: actions/groupmembers.php:190 lib/action.php:587
+#: actions/groupmembers.php:190 lib/primarynav.php:63
 msgid "Admin"
 msgstr ""
 
@@ -3025,7 +3025,7 @@ msgstr ""
 #. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
 #. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
 #. TRANS: This message contains Markdown links in the form [link text](link).
-#: actions/groups.php:95
+#: actions/groups.php:89
 #, php-format
 msgid ""
 "%%%%site.name%%%% groups let you find and talk with people of similar "
@@ -3036,7 +3036,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Link to create a new group on the group list page.
-#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:115
 msgid "Create a new group"
 msgstr ""
 
@@ -3580,7 +3580,7 @@ msgid "Error setting user. You are probably not authorized."
 msgstr ""
 
 #. TRANS: Page title for login page.
-#: actions/login.php:189 lib/action.php:604
+#: actions/login.php:189 lib/primarynav.php:75
 msgid "Login"
 msgstr ""
 
@@ -4076,7 +4076,7 @@ msgstr ""
 
 #. TRANS: Title for Paths admin panel.
 #. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:58 lib/adminpanelaction.php:371
+#: actions/pathsadminpanel.php:58 lib/adminpanelnav.php:100
 msgid "Paths"
 msgstr ""
 
@@ -4396,7 +4396,7 @@ msgstr ""
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
 #: actions/pluginsadminpanel.php:56 actions/version.php:191
-#: lib/adminpanelaction.php:411
+#: lib/adminpanelnav.php:140
 msgid "Plugins"
 msgstr ""
 
@@ -4612,7 +4612,7 @@ msgstr ""
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
+#: actions/public.php:132 lib/publicgroupnav.php:65
 msgid "Public timeline"
 msgstr ""
 
@@ -4628,24 +4628,24 @@ msgstr ""
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
+#: actions/public.php:173
 #, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
 
-#: actions/public.php:191
+#: actions/public.php:176
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
+#: actions/public.php:180
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
 
-#: actions/public.php:242
+#: actions/public.php:227
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4654,7 +4654,7 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 
-#: actions/public.php:247
+#: actions/public.php:232
 #, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -4916,7 +4916,7 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:424 actions/register.php:428
-#: actions/siteadminpanel.php:238 lib/settingsnav.php:92
+#: actions/siteadminpanel.php:238 lib/settingsnav.php:79
 msgid "Email"
 msgstr ""
 
@@ -5020,7 +5020,7 @@ msgstr ""
 
 #. TRANS: Link text for link that will subscribe to a remote profile.
 #: actions/remotesubscribe.php:136 lib/subscribeform.php:139
-#: lib/userprofile.php:402
+#: lib/userprofile.php:406
 msgid "Subscribe"
 msgstr ""
 
@@ -5066,7 +5066,7 @@ msgstr ""
 
 #. TRANS: RSS reply feed title. %s is a user nickname.
 #: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
+#: lib/personalgroupnav.php:83
 #, php-format
 msgid "Replies to %s"
 msgstr ""
@@ -5091,21 +5091,21 @@ msgstr ""
 msgid "Replies feed for %s (Atom)"
 msgstr ""
 
-#: actions/replies.php:199
+#: actions/replies.php:187
 #, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
 
-#: actions/replies.php:204
+#: actions/replies.php:192
 #, php-format
 msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
+#: actions/replies.php:194
 #, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
@@ -5225,7 +5225,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:379
+#: lib/adminpanelnav.php:108
 msgid "Sessions"
 msgstr ""
 
@@ -5332,7 +5332,7 @@ msgid "Feed for favorites of %s (Atom)"
 msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
-#: actions/showfavorites.php:209
+#: actions/showfavorites.php:198
 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."
@@ -5340,7 +5340,7 @@ msgstr ""
 
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
 #. TRANS: %s is a username.
-#: actions/showfavorites.php:213
+#: actions/showfavorites.php:202
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
@@ -5350,7 +5350,7 @@ msgstr ""
 #. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
 #. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
 #. TRANS: (link text)[link] is a Mark Down link.
-#: actions/showfavorites.php:220
+#: actions/showfavorites.php:209
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
@@ -5359,7 +5359,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: Page notice for show favourites page.
-#: actions/showfavorites.php:251
+#: actions/showfavorites.php:240
 msgid "This is a way to share what you like."
 msgstr ""
 
@@ -5902,7 +5902,7 @@ msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:395
+#: lib/adminpanelnav.php:124
 msgid "Snapshots"
 msgstr ""
 
@@ -6082,12 +6082,12 @@ msgid "Subscription feed for %s (Atom)"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241 lib/settingsnav.php:110
+#: actions/subscriptions.php:241 lib/settingsnav.php:97
 msgid "IM"
 msgstr ""
 
 #. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:256 lib/settingsnav.php:117
+#: actions/subscriptions.php:256 lib/settingsnav.php:104
 msgid "SMS"
 msgstr ""
 
@@ -6278,8 +6278,8 @@ msgstr ""
 msgid "Invalid default subscripton: \"%1$s\" is not a user."
 msgstr ""
 
-#: actions/useradminpanel.php:215 lib/action.php:571 lib/settingsnav.php:77
-#: lib/subgroupnav.php:81
+#: actions/useradminpanel.php:215 lib/personalgroupnav.php:76
+#: lib/settingsnav.php:64 lib/subgroupnav.php:79
 msgid "Profile"
 msgstr ""
 
@@ -6540,7 +6540,7 @@ msgid "Contributors"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: actions/version.php:167 lib/adminpanelaction.php:403
+#: actions/version.php:167 lib/adminpanelnav.php:132
 msgid "License"
 msgstr ""
 
@@ -6573,7 +6573,7 @@ msgid "Name"
 msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:891
+#: actions/version.php:198 lib/secondarynav.php:78
 msgid "Version"
 msgstr ""
 
@@ -6722,71 +6722,71 @@ msgstr ""
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
-#: classes/Notice.php:98
+#: classes/Notice.php:99
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:199
+#: classes/Notice.php:200
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:279
+#: classes/Notice.php:281
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:284
+#: classes/Notice.php:286
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:290
+#: classes/Notice.php:292
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:297
+#: classes/Notice.php:299
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:305
+#: classes/Notice.php:307
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:372 classes/Notice.php:399
+#: classes/Notice.php:380 classes/Notice.php:407
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:929
+#: classes/Notice.php:937
 msgid "Bad type provided to saveKnownGroups."
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1028
+#: classes/Notice.php:1036
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Server exception thrown when a reply cannot be saved.
 #. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
-#: classes/Notice.php:1144
+#: classes/Notice.php:1152
 #, php-format
 msgid "Could not save reply for %1$d, %2$d."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1663
+#: classes/Notice.php:1671
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6955,104 +6955,15 @@ msgstr ""
 msgid "Write a reply..."
 msgstr ""
 
-#: lib/action.php:565 lib/personalgroupnav.php:99
-msgid "Home"
-msgstr ""
-
-#: lib/action.php:566
-msgid "Friends timeline"
-msgstr ""
-
-#: lib/action.php:572
-msgid "Your profile"
-msgstr ""
-
-#: lib/action.php:576 lib/action.php:599 lib/publicgroupnav.php:78
-msgid "Public"
-msgstr ""
-
-#: lib/action.php:577 lib/action.php:600
-msgid "Everyone on this site"
-msgstr ""
-
-#: lib/action.php:581
-msgid "Settings"
-msgstr ""
-
-#: lib/action.php:582
-msgid "Change your personal settings"
-msgstr ""
-
-#: lib/action.php:588
-msgid "Site configuration"
-msgstr ""
-
-#: lib/action.php:593
-msgid "Logout"
-msgstr ""
-
-#: lib/action.php:594
-msgid "Logout from the site"
-msgstr ""
-
-#: lib/action.php:605
-msgid "Login to the site"
-msgstr ""
-
-#: lib/action.php:612
-msgid "Search"
-msgstr ""
-
-#: lib/action.php:613
-msgid "Search the site"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:870
-msgid "Help"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:873
-msgid "About"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:876
-msgid "FAQ"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:881
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:885
-msgid "Privacy"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:888
-msgid "Source"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:895
-msgid "Contact"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:898
-msgid "Badge"
+#: lib/action.php:583
+msgid "Status"
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:927
+#: lib/action.php:918
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -7060,7 +6971,7 @@ msgid ""
 msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:930
+#: lib/action.php:921
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr ""
@@ -7069,7 +6980,7 @@ msgstr ""
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:937
+#: lib/action.php:928
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -7079,39 +6990,39 @@ msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:955
+#: lib/action.php:946
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:962
+#: lib/action.php:953
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:966
+#: lib/action.php:957
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:998
+#: lib/action.php:989
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1341
+#: lib/action.php:1332
 msgid "After"
 msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1351
+#: lib/action.php:1342
 msgid "Before"
 msgstr ""
 
@@ -7234,75 +7145,75 @@ msgid "Unable to delete design setting."
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:337
+#: lib/adminpanelnav.php:66
 msgid "Basic site configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:339
+#: lib/adminpanelnav.php:68
 msgctxt "MENU"
 msgid "Site"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:345
+#: lib/adminpanelnav.php:74
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/adminpanelaction.php:347 lib/groupnav.php:135
+#: lib/adminpanelnav.php:76 lib/groupnav.php:133
 msgctxt "MENU"
 msgid "Design"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:353
+#: lib/adminpanelnav.php:82
 msgid "User configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:110
+#: lib/adminpanelnav.php:84 lib/personalgroupnav.php:88
 msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:361
+#: lib/adminpanelnav.php:90
 msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:369
+#: lib/adminpanelnav.php:98
 msgid "Paths configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:377
+#: lib/adminpanelnav.php:106
 msgid "Sessions configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:385
+#: lib/adminpanelnav.php:114
 msgid "Edit site notice"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:387
+#: lib/adminpanelnav.php:116
 msgid "Site notice"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:393
+#: lib/adminpanelnav.php:122
 msgid "Snapshots configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:401
+#: lib/adminpanelnav.php:130
 msgid "Set site license"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:409
+#: lib/adminpanelnav.php:138
 msgid "Plugins configuration"
 msgstr ""
 
@@ -7919,6 +7830,14 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
+#: lib/defaultlocalnav.php:58 lib/personalgroupnav.php:71
+msgid "Home"
+msgstr ""
+
+#: lib/defaultlocalnav.php:62 lib/publicgroupnav.php:64
+msgid "Public"
+msgstr ""
+
 #. TRANS: Description of form for deleting a user.
 #: lib/deleteuserform.php:75
 msgid "Delete this user"
@@ -8112,70 +8031,70 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:86
+#: lib/groupnav.php:84
 msgctxt "MENU"
 msgid "Group"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:89
+#: lib/groupnav.php:87
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page.
-#: lib/groupnav.php:95
+#: lib/groupnav.php:93
 msgctxt "MENU"
 msgid "Members"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:98
+#: lib/groupnav.php:96
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s group members"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:108
+#: lib/groupnav.php:106
 msgctxt "MENU"
 msgid "Blocked"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:111
+#: lib/groupnav.php:109
 #, php-format
 msgctxt "TOOLTIP"
 msgid "%s blocked users"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:117
+#: lib/groupnav.php:115
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:120
+#: lib/groupnav.php:118
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr ""
 
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/groupnav.php:126
+#: lib/groupnav.php:124
 msgctxt "MENU"
 msgid "Logo"
 msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:129
+#: lib/groupnav.php:127
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
@@ -8183,7 +8102,7 @@ msgstr ""
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
-#: lib/groupnav.php:138
+#: lib/groupnav.php:136
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Add or edit %s design"
@@ -8293,24 +8212,24 @@ msgid "Leave"
 msgstr ""
 
 #. TRANS: Menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:77
+#: lib/logingroupnav.php:64
 msgctxt "MENU"
 msgid "Login"
 msgstr ""
 
 #. TRANS: Title for menu item for logging in to the StatusNet site.
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:66
 msgid "Login with a username and password"
 msgstr ""
 
 #. TRANS: Menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:85
+#: lib/logingroupnav.php:72
 msgctxt "MENU"
 msgid "Register"
 msgstr ""
 
 #. TRANS: Title for menu item for registering with the StatusNet site.
-#: lib/logingroupnav.php:87
+#: lib/logingroupnav.php:74
 msgid "Sign up for a new account"
 msgstr ""
 
@@ -8566,12 +8485,28 @@ msgstr ""
 msgid "Only the user can read their own mailboxes."
 msgstr ""
 
-#: lib/mailbox.php:125
+#: lib/mailbox.php:119
 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 ""
 
+#: lib/mailboxmenu.php:59
+msgid "Inbox"
+msgstr ""
+
+#: lib/mailboxmenu.php:60 lib/personalgroupnav.php:99
+msgid "Your incoming messages"
+msgstr ""
+
+#: lib/mailboxmenu.php:64
+msgid "Outbox"
+msgstr ""
+
+#: lib/mailboxmenu.php:65
+msgid "Your sent messages"
+msgstr ""
+
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 msgstr ""
@@ -8655,7 +8590,7 @@ msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/messagelist.php:77
+#: lib/messagelist.php:77 lib/personalgroupnav.php:98
 msgid "Messages"
 msgstr ""
 
@@ -8663,6 +8598,22 @@ msgstr ""
 msgid "from"
 msgstr ""
 
+#: lib/microappplugin.php:302
+msgid "Can't get author for activity."
+msgstr ""
+
+#: lib/microappplugin.php:338
+msgid "Bookmark not posted to this group."
+msgstr ""
+
+#: lib/microappplugin.php:351
+msgid "Object not posted to this user."
+msgstr ""
+
+#: lib/microappplugin.php:355
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 #: lib/nickname.php:178
 msgid "Nickname cannot be empty."
@@ -8804,30 +8755,18 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr ""
 
-#: lib/personalgroupnav.php:104
+#: lib/personalgroupnav.php:77
+msgid "Your profile"
+msgstr ""
+
+#: lib/personalgroupnav.php:82
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:109
+#: lib/personalgroupnav.php:87
 msgid "Favorites"
 msgstr ""
 
-#: lib/personalgroupnav.php:120
-msgid "Inbox"
-msgstr ""
-
-#: lib/personalgroupnav.php:121
-msgid "Your incoming messages"
-msgstr ""
-
-#: lib/personalgroupnav.php:125
-msgid "Outbox"
-msgstr ""
-
-#: lib/personalgroupnav.php:126
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #: lib/personaltagcloudsection.php:56
 #, php-format
@@ -8856,9 +8795,41 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+#: lib/primarynav.php:57
+msgid "Settings"
+msgstr ""
+
+#: lib/primarynav.php:58
+msgid "Change your personal settings"
+msgstr ""
+
+#: lib/primarynav.php:64
+msgid "Site configuration"
+msgstr ""
+
+#: lib/primarynav.php:69
+msgid "Logout"
+msgstr ""
+
+#: lib/primarynav.php:70
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/primarynav.php:76
+msgid "Login to the site"
+msgstr ""
+
+#: lib/primarynav.php:83
+msgid "Search"
+msgstr ""
+
+#: lib/primarynav.php:84
+msgid "Search the site"
+msgstr ""
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:88
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:86
 msgid "Subscriptions"
 msgstr ""
 
@@ -8869,7 +8840,7 @@ msgstr ""
 
 #. TRANS: H2 text for user subscriber statistics.
 #. TRANS: Label for user statistics.
-#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:96
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:94
 msgid "Subscribers"
 msgstr ""
 
@@ -8891,7 +8862,7 @@ msgstr ""
 #. TRANS: Label for user statistics.
 #. TRANS: H2 text for user group membership statistics.
 #: lib/profileaction.php:239 lib/profileaction.php:290
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:104
+#: lib/publicgroupnav.php:67 lib/searchgroupnav.php:80 lib/subgroupnav.php:102
 msgid "Groups"
 msgstr ""
 
@@ -8911,19 +8882,19 @@ msgstr ""
 msgid "Unimplemented method."
 msgstr ""
 
-#: lib/publicgroupnav.php:82
+#: lib/publicgroupnav.php:68
 msgid "User groups"
 msgstr ""
 
-#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+#: lib/publicgroupnav.php:70 lib/publicgroupnav.php:71
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
+#: lib/publicgroupnav.php:74
 msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
+#: lib/publicgroupnav.php:78
 msgid "Popular"
 msgstr ""
 
@@ -8978,22 +8949,63 @@ msgctxt "BUTTON"
 msgid "Search"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
+#: lib/searchgroupnav.php:76
 msgid "People"
 msgstr ""
 
-#: lib/searchgroupnav.php:81
+#: lib/searchgroupnav.php:77
 msgid "Find people on this site"
 msgstr ""
 
-#: lib/searchgroupnav.php:83
+#: lib/searchgroupnav.php:79
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
+#: lib/searchgroupnav.php:81
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/secondarynav.php:57
+msgid "Help"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/secondarynav.php:60
+msgid "About"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/secondarynav.php:63
+msgid "FAQ"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/secondarynav.php:68
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/secondarynav.php:72
+msgid "Privacy"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+#: lib/secondarynav.php:75
+msgid "Source"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+#: lib/secondarynav.php:82
+msgid "Contact"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+#: lib/secondarynav.php:85
+msgid "Badge"
+msgstr ""
+
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -9002,47 +9014,47 @@ msgstr ""
 msgid "More..."
 msgstr ""
 
-#: lib/settingsnav.php:78
+#: lib/settingsnav.php:65
 msgid "Change your profile settings"
 msgstr ""
 
-#: lib/settingsnav.php:83
+#: lib/settingsnav.php:70
 msgid "Upload an avatar"
 msgstr ""
 
-#: lib/settingsnav.php:88
+#: lib/settingsnav.php:75
 msgid "Change your password"
 msgstr ""
 
-#: lib/settingsnav.php:93
+#: lib/settingsnav.php:80
 msgid "Change email handling"
 msgstr ""
 
-#: lib/settingsnav.php:98
+#: lib/settingsnav.php:85
 msgid "Design your profile"
 msgstr ""
 
-#: lib/settingsnav.php:102
+#: lib/settingsnav.php:89
 msgid "URL"
 msgstr ""
 
-#: lib/settingsnav.php:103
+#: lib/settingsnav.php:90
 msgid "URL shorteners"
 msgstr ""
 
-#: lib/settingsnav.php:111
+#: lib/settingsnav.php:98
 msgid "Updates by instant messenger (IM)"
 msgstr ""
 
-#: lib/settingsnav.php:118
+#: lib/settingsnav.php:105
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/settingsnav.php:123
+#: lib/settingsnav.php:110
 msgid "Connections"
 msgstr ""
 
-#: lib/settingsnav.php:124
+#: lib/settingsnav.php:111
 msgid "Authorized connected applications"
 msgstr ""
 
@@ -9054,26 +9066,26 @@ msgstr ""
 msgid "Silence this user"
 msgstr ""
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:87
 #, php-format
 msgid "People %s subscribes to"
 msgstr ""
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:95
 #, php-format
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:105
+#: lib/subgroupnav.php:103
 #, php-format
 msgid "Groups %s is a member of"
 msgstr ""
 
-#: lib/subgroupnav.php:111
+#: lib/subgroupnav.php:109
 msgid "Invite"
 msgstr ""
 
-#: lib/subgroupnav.php:112
+#: lib/subgroupnav.php:110
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
@@ -9198,59 +9210,59 @@ msgstr ""
 msgid "User %1$s (%2$d) has no profile record."
 msgstr ""
 
-#: lib/userprofile.php:116
+#: lib/userprofile.php:118
 msgid "Edit Avatar"
 msgstr ""
 
 #. TRANS: H2 for user actions in a profile.
 #. TRANS: H2 for entity actions in a profile.
-#: lib/userprofile.php:216 lib/userprofile.php:232
+#: lib/userprofile.php:220 lib/userprofile.php:236
 msgid "User actions"
 msgstr ""
 
 #. TRANS: Text shown in user profile of not yet compeltely deleted users.
-#: lib/userprofile.php:220
+#: lib/userprofile.php:224
 msgid "User deletion in progress..."
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:248
+#: lib/userprofile.php:252
 msgid "Edit profile settings"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:250
+#: lib/userprofile.php:254
 msgid "Edit"
 msgstr ""
 
 #. TRANS: Link title for link on user profile.
-#: lib/userprofile.php:274
+#: lib/userprofile.php:278
 msgid "Send a direct message to this user"
 msgstr ""
 
 #. TRANS: Link text for link on user profile.
-#: lib/userprofile.php:276
+#: lib/userprofile.php:280
 msgid "Message"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:318
+#: lib/userprofile.php:322
 msgid "Moderate"
 msgstr ""
 
 #. TRANS: Label text on user profile to select a user role.
-#: lib/userprofile.php:357
+#: lib/userprofile.php:361
 msgid "User role"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:360
+#: lib/userprofile.php:364
 msgctxt "role"
 msgid "Administrator"
 msgstr ""
 
 #. TRANS: Role that can be set for a user profile.
-#: lib/userprofile.php:362
+#: lib/userprofile.php:366
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 90c09d93b6..54b5404f05 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -13,17 +13,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:38+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:31+0000\n"
 "Language-Team: Swedish <http://translatewiki.net/wiki/Portal:sv>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -6028,82 +6028,9 @@ msgstr "Svara"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Hemsida"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s tidslinje"
-
-msgid "Your profile"
-msgstr "Grupprofil"
-
-msgid "Public"
-msgstr "Publikt"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Hitta personer på denna webbplats"
-
-msgid "Settings"
-msgstr "Inställningar för SMS"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Ändra dina profilinställningar"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Konfiguration av användare"
-
-msgid "Logout"
-msgstr "Logga ut"
-
-msgid "Logout from the site"
-msgstr "Logga ut från webbplatsen"
-
-msgid "Login to the site"
-msgstr "Logga in på webbplatsen"
-
-msgid "Search"
-msgstr "Sök"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Sök webbplats"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Hjälp"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Om"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "Frågor & svar"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Användarvillkor"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Sekretess"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Källa"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Kontakt"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Emblem"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6896,6 +6823,12 @@ msgstr "Gå till installeraren."
 msgid "Database error"
 msgstr "Databasfel"
 
+msgid "Home"
+msgstr "Hemsida"
+
+msgid "Public"
+msgstr "Publikt"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Ta bort denna användare"
@@ -7570,6 +7503,18 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
+msgid "Inbox"
+msgstr "Inkorg"
+
+msgid "Your incoming messages"
+msgstr "Dina inkommande meddelanden"
+
+msgid "Outbox"
+msgstr "Utkorg"
+
+msgid "Your sent messages"
+msgstr "Dina skickade meddelanden"
+
 msgid "Could not parse message."
 msgstr "Kunde inte tolka meddelande."
 
@@ -7649,6 +7594,20 @@ msgstr "Meddelande"
 msgid "from"
 msgstr "från"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Du får inte ta bort denna grupp."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Ta inte bort denna grupp"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7763,24 +7722,15 @@ msgstr "Duplicera notis."
 msgid "Couldn't insert new subscription."
 msgstr "Kunde inte infoga ny prenumeration."
 
+msgid "Your profile"
+msgstr "Grupprofil"
+
 msgid "Replies"
 msgstr "Svar"
 
 msgid "Favorites"
 msgstr "Favoriter"
 
-msgid "Inbox"
-msgstr "Inkorg"
-
-msgid "Your incoming messages"
-msgstr "Dina inkommande meddelanden"
-
-msgid "Outbox"
-msgstr "Utkorg"
-
-msgid "Your sent messages"
-msgstr "Dina skickade meddelanden"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7804,6 +7754,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Inställningar för SMS"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Ändra dina profilinställningar"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Konfiguration av användare"
+
+msgid "Logout"
+msgstr "Logga ut"
+
+msgid "Logout from the site"
+msgstr "Logga ut från webbplatsen"
+
+msgid "Login to the site"
+msgstr "Logga in på webbplatsen"
+
+msgid "Search"
+msgstr "Sök"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Sök webbplats"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7913,6 +7890,39 @@ msgstr "Hitta innehåll i notiser"
 msgid "Find groups on this site"
 msgstr "Hitta grupper på denna webbplats"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Hjälp"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Om"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "Frågor & svar"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Användarvillkor"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Sekretess"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Källa"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Kontakt"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Emblem"
+
 msgid "Untitled section"
 msgstr "Namnlös sektion"
 
@@ -8195,19 +8205,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Fullständigt namn är för långt (max 255 tecken)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "beskrivning är för lång (max %d tecken)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Beskrivning av plats är för lång (max 255 tecken)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "För många alias! Maximum %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s tidslinje"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Innehåll"
+#~ msgid "Everyone on this site"
+#~ msgstr "Hitta personer på denna webbplats"
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index e2c657b3a3..a79be5da68 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -10,17 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:39+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:32+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5918,82 +5918,9 @@ msgstr "స్పందించండి"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "ముంగిలి"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s కాలరేఖ"
-
-msgid "Your profile"
-msgstr "గుంపు ప్రొఫైలు"
-
-msgid "Public"
-msgstr "ప్రజా"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
-
-msgid "Settings"
-msgstr "SMS అమరికలు"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "వాడుకరి స్వరూపణం"
-
-msgid "Logout"
-msgstr "నిష్క్రమించు"
-
-msgid "Logout from the site"
-msgstr "సైటు నుండి నిష్క్రమించు"
-
-msgid "Login to the site"
-msgstr "సైటులోని ప్రవేశించు"
-
-msgid "Search"
-msgstr "వెతుకు"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "సైటుని వెతుకు"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "సహాయం"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "గురించి"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ప్రశ్నలు"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "సేవా నియమాలు"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "అంతరంగికత"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "మూలము"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "సంప్రదించు"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "బాడ్జి"
+msgid "Status"
+msgstr "స్టేటస్‌నెట్"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6758,6 +6685,12 @@ msgstr "సైటు లోనికి ప్రవేశించండి"
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "ముంగిలి"
+
+msgid "Public"
+msgstr "ప్రజా"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "ఈ వాడుకరిని తొలగించు"
@@ -7419,6 +7352,18 @@ msgstr ""
 "మీకు అంతరంగిక సందేశాలు లేవు. ఇతర వాడుకరులతో సంభాషణకై మీరు వారికి అంతరంగిక సందేశాలు "
 "పంపించవచ్చు. మీ కంటికి మాత్రమే కనబడేలా వారు మీకు సందేశాలు పంపవచ్చు."
 
+msgid "Inbox"
+msgstr "వచ్చినవి"
+
+msgid "Your incoming messages"
+msgstr "మీకు వచ్చిన సందేశాలు"
+
+msgid "Outbox"
+msgstr "పంపినవి"
+
+msgid "Your sent messages"
+msgstr "మీరు పంపిన సందేశాలు"
+
 #, fuzzy
 msgid "Could not parse message."
 msgstr "వాడుకరిని తాజాకరించలేకున్నాం."
@@ -7497,6 +7442,20 @@ msgstr "సందేశం"
 msgid "from"
 msgstr "నుండి"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "ఈ గుంపును తొలగించడానికి మీకు అనుమతి లేదు."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "ఈ వాడుకరిని తొలగించకండి."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7614,24 +7573,15 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "కొత్త చందాని చేర్చలేకపోయాం."
 
+msgid "Your profile"
+msgstr "గుంపు ప్రొఫైలు"
+
 msgid "Replies"
 msgstr "స్పందనలు"
 
 msgid "Favorites"
 msgstr "ఇష్టాంశాలు"
 
-msgid "Inbox"
-msgstr "వచ్చినవి"
-
-msgid "Your incoming messages"
-msgstr "మీకు వచ్చిన సందేశాలు"
-
-msgid "Outbox"
-msgstr "పంపినవి"
-
-msgid "Your sent messages"
-msgstr "మీరు పంపిన సందేశాలు"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7656,6 +7606,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS అమరికలు"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "ఫ్రొఫైలు అమరికలని మార్చు"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "వాడుకరి స్వరూపణం"
+
+msgid "Logout"
+msgstr "నిష్క్రమించు"
+
+msgid "Logout from the site"
+msgstr "సైటు నుండి నిష్క్రమించు"
+
+msgid "Login to the site"
+msgstr "సైటులోని ప్రవేశించు"
+
+msgid "Search"
+msgstr "వెతుకు"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "సైటుని వెతుకు"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7766,6 +7743,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr "ఈ సైటులోని గుంపులని కనుగొనండి"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "సహాయం"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "గురించి"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ప్రశ్నలు"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "సేవా నియమాలు"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "అంతరంగికత"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "మూలము"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "సంప్రదించు"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "బాడ్జి"
+
 msgid "Untitled section"
 msgstr "శీర్షికలేని విభాగం"
 
@@ -8047,21 +8057,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "పూర్తి పేరు చాలా పెద్దగా ఉంది (గరిష్ఠం 255 అక్షరాలు)."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s కాలరేఖ"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "వివరణ చాలా పెద్దదిగా ఉంది (140 అక్షరాలు గరిష్ఠం)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "ప్రాంతం పేరు మరీ పెద్దగా ఉంది (255 అక్షరాలు గరిష్ఠం)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "చాలా మారుపేర్లు! %d గరిష్ఠం."
-
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "వ్యాఖ్య"
-
-#~ msgid "Add a comment..."
-#~ msgstr "ఒక వ్యాఖ్యని చేర్చండి..."
+#, fuzzy
+#~ msgid "Everyone on this site"
+#~ msgstr "ఈ సైటులోని వ్యక్తులని కనుగొనండి"
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 95d467fcf1..a0278b8b99 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -12,17 +12,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:40+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:33+0000\n"
 "Language-Team: Turkish <http://translatewiki.net/wiki/Portal:tr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5925,84 +5925,9 @@ msgstr "Cevaplar"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "Başlangıç Sayfası"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s zaman çizelgesi"
-
-msgid "Your profile"
-msgstr "Kullanıcının profili yok."
-
-msgid "Public"
-msgstr "Genel"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Siteye giriş"
-
-msgid "Settings"
-msgstr "Profil ayarları"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Profil ayarlarınızı değiştirin"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Onay kodu yok."
-
-msgid "Logout"
-msgstr "Çıkış"
-
-#, fuzzy
-msgid "Logout from the site"
-msgstr "Siteye giriş"
-
-#, fuzzy
-msgid "Login to the site"
-msgstr "Siteye giriş"
-
-msgid "Search"
-msgstr "Ara"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Ara"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Yardım"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Hakkında"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "SSS"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr ""
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Gizlilik"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Kaynak"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "İletişim"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr ""
+msgid "Status"
+msgstr "İstatistikler"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6762,6 +6687,12 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
+msgid "Home"
+msgstr "Başlangıç Sayfası"
+
+msgid "Public"
+msgstr "Genel"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Bu kullanıcıyı sil"
@@ -7346,6 +7277,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
+msgid "Inbox"
+msgstr ""
+
+msgid "Your incoming messages"
+msgstr ""
+
+msgid "Outbox"
+msgstr ""
+
+msgid "Your sent messages"
+msgstr ""
+
 msgid "Could not parse message."
 msgstr "Mesaj ayrıştırılamadı."
 
@@ -7422,6 +7365,20 @@ msgstr "Mesaj gönder"
 msgid "from"
 msgstr ""
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Bu grubun bir üyesi değilsiniz."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Bu durum mesajını silme"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr ""
@@ -7538,6 +7495,9 @@ msgstr ""
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
 
+msgid "Your profile"
+msgstr "Kullanıcının profili yok."
+
 msgid "Replies"
 msgstr "Cevaplar"
 
@@ -7545,18 +7505,6 @@ msgstr "Cevaplar"
 msgid "Favorites"
 msgstr "%s favorileri"
 
-msgid "Inbox"
-msgstr ""
-
-msgid "Your incoming messages"
-msgstr ""
-
-msgid "Outbox"
-msgstr ""
-
-msgid "Your sent messages"
-msgstr ""
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7580,6 +7528,35 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "Profil ayarları"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "Profil ayarlarınızı değiştirin"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "Onay kodu yok."
+
+msgid "Logout"
+msgstr "Çıkış"
+
+#, fuzzy
+msgid "Logout from the site"
+msgstr "Siteye giriş"
+
+#, fuzzy
+msgid "Login to the site"
+msgstr "Siteye giriş"
+
+msgid "Search"
+msgstr "Ara"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "Ara"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7697,6 +7674,39 @@ msgstr ""
 msgid "Find groups on this site"
 msgstr ""
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Yardım"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Hakkında"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "SSS"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Gizlilik"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Kaynak"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "İletişim"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr ""
+
 msgid "Untitled section"
 msgstr ""
 
@@ -7981,19 +7991,10 @@ msgstr ""
 msgid "Getting backup from file '%s'."
 msgstr ""
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Tam isim çok uzun (en fazla: 255 karakter)."
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "Tanım çok uzun (en fazla %d karakter)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Yer bilgisi çok uzun (en fazla 255 karakter)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Çok fazla diğerisim! En fazla %d."
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s zaman çizelgesi"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "İçerik"
+#~ msgid "Everyone on this site"
+#~ msgstr "Siteye giriş"
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index b830803af4..3077a74597 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -12,18 +12,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:41+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:34+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
 "2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -956,9 +956,9 @@ msgstr "Метод не виконується."
 msgid "Repeated to %s"
 msgstr "Повторено для %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that were to repeated to %2$s / %3$s."
-msgstr "%1$s оновив цю відповідь на допис від %2$s / %3$s."
+msgstr "Дописи %1$s, що вони були повторені %2$s / %3$s."
 
 #. TRANS: Title of list of repeated notices of the logged in user.
 #. TRANS: %s is the nickname of the logged in user.
@@ -966,9 +966,9 @@ msgstr "%1$s оновив цю відповідь на допис від %2$s /
 msgid "Repeats of %s"
 msgstr "Повторення %s"
 
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s notices that %2$s / %3$s has repeated."
-msgstr "%1$s додав(ла) ваш допис %2$s до обраних."
+msgstr "Дописи %1$s, які повторював %2$s / %3$s."
 
 #. TRANS: Title for timeline with lastest notices with a given tag.
 #. TRANS: %s is the tag.
@@ -1441,13 +1441,11 @@ msgstr "Цю адресу вже підтверджено."
 msgid "Couldn't update user."
 msgstr "Не вдалося оновити користувача."
 
-#, fuzzy
 msgid "Couldn't update user im preferences."
-msgstr "Не вдалося оновити запис користувача."
+msgstr "Не вдалося оновити налаштування сервісу миттєвих повідомлень."
 
-#, fuzzy
 msgid "Couldn't insert user im preferences."
-msgstr "Не вдалося додати нову підписку."
+msgstr "Не вдалося вставити налаштування сервісу миттєвих повідомлень."
 
 #. TRANS: Server error displayed when an address confirmation code deletion from the
 #. TRANS: database fails in the contact address confirmation action.
@@ -2567,73 +2565,63 @@ msgstr "Налаштування ІМ"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can send and receive notices through instant messaging [instant messages]"
 "(%%doc.im%%). Configure your addresses and settings below."
 msgstr ""
-"Ви можете надсилати та отримувати дописи через Jabber/Google Talk [службу "
-"миттєвих повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції "
-"нижче."
+"Ви можете надсилати та отримувати дописи через повідомлення [служби миттєвих "
+"повідомлень](%%doc.im%%). Вкажіть свою адресу і налаштуйте опції нижче."
 
 #. TRANS: Message given in the IM settings if IM is not enabled on the site.
 msgid "IM is not available."
 msgstr "ІМ недоступний"
 
-#, fuzzy, php-format
+#, php-format
 msgid "Current confirmed %s address."
-msgstr "Поточна підтверджена поштова адреса."
+msgstr "Поточна підтверджена %s адреса."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your %s account for a message "
 "with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"Очікування підтвердження цієї адреси. Перевірте свій Jabber/Google Talk "
-"акаунт, туди має надійти повідомлення з подальшими інструкціями. (Ви додали %"
-"s до вашого списку контактів?)"
+"Очікування підтвердження цієї адреси. Перевірте свій %s-акаунт, туди має "
+"надійти повідомлення з подальшими інструкціями. (Ви додали %s до вашого "
+"списку контактів?)"
 
 msgid "IM address"
 msgstr "ІМ-адреса"
 
 #, php-format
 msgid "%s screenname."
-msgstr ""
+msgstr "Псевдонім %s."
 
 #. TRANS: Header for IM preferences form.
-#, fuzzy
 msgid "IM Preferences"
 msgstr "Преференції ІМ"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me notices"
-msgstr "Надіслати допис"
+msgstr "Надсилати мені дописи"
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Post a notice when my status changes."
-msgstr ""
-"Надсилати дописи на сайт, коли мій статус Jabber/Google Talk змінюється."
+msgstr "Надсилати дописи на сайт, коли мій статус змінюється."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Send me replies from people I'm not subscribed to."
-msgstr ""
-"Надсилати мені відповіді через Jabber/Google Talk від людей, до яких я не "
-"підписаний."
+msgstr "Надсилати мені відповіді від людей, до яких я не підписаний."
 
 #. TRANS: Checkbox label in IM preferences form.
-#, fuzzy
 msgid "Publish a MicroID"
-msgstr "Позначати міткою MicroID мою електронну адресу."
+msgstr "Публікувати MicroID."
 
 #. TRANS: Server error thrown on database error updating IM preferences.
-#, fuzzy
 msgid "Couldn't update IM preferences."
-msgstr "Не вдалося оновити користувача."
+msgstr "Не вдалося оновити налаштування сервісу миттєвих повідомлень."
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #. TRANS: Confirmation message after saving preferences.
@@ -2641,44 +2629,35 @@ msgid "Preferences saved."
 msgstr "Преференції збережно."
 
 #. TRANS: Message given saving IM address without having provided one.
-#, fuzzy
 msgid "No screenname."
-msgstr "Немає імені."
+msgstr "Немає псевдоніму."
 
-#, fuzzy
 msgid "No transport."
-msgstr "Немає допису."
+msgstr "Немає транспорту."
 
 #. TRANS: Message given saving IM address that cannot be normalised.
-#, fuzzy
 msgid "Cannot normalize that screenname"
-msgstr "Не можна полагодити цей Jabber ID."
+msgstr "Не можна впорядкувати цей псевдонім"
 
 #. TRANS: Message given saving IM address that not valid.
-#, fuzzy
 msgid "Not a valid screenname"
-msgstr "Це недійсне ім’я користувача."
+msgstr "Це недійсне ім’я користувача"
 
 #. TRANS: Message given saving IM address that is already set for another user.
-#, fuzzy
 msgid "Screenname already belongs to another user."
-msgstr "Jabber ID вже належить іншому користувачу."
+msgstr "Даний псевдонім вже належить іншому користувачеві."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
-#, fuzzy
 msgid "A confirmation code was sent to the IM address you added."
-msgstr ""
-"Код підтвердження був відправлений на адресу IM, яку ви зазначили. Ви "
-"повинні затвердити %s для відправлення вам повідомлень."
+msgstr "Код підтвердження був відправлений на адресу IM, яку ви зазначили."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 msgid "That is the wrong IM address."
 msgstr "Це помилкова адреса IM."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
-#, fuzzy
 msgid "Couldn't delete confirmation."
-msgstr "Не вдалося видалити підтвердження ІМ-адреси."
+msgstr "Не вдалося видалити підтвердження."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "IM confirmation cancelled."
@@ -2686,14 +2665,13 @@ msgstr "Підтвердження ІМ скасовано."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
-#, fuzzy
 msgid "That is not your screenname."
-msgstr "Це не ваш телефонний номер."
+msgstr "Це не ваш псевдонім."
 
 #. TRANS: Server error thrown on database error removing a registered IM address.
-#, fuzzy
 msgid "Couldn't update user im prefs."
-msgstr "Не вдалося оновити запис користувача."
+msgstr ""
+"Не вдалося оновити користувацькі налаштування служби миттєвих повідомлень."
 
 #. TRANS: Message given after successfully removing a registered Instant Messaging address.
 msgid "The IM address was removed."
@@ -2974,9 +2952,8 @@ msgid "Type"
 msgstr "Тип"
 
 #. TRANS: Dropdown field instructions in the license admin panel.
-#, fuzzy
 msgid "Select a license."
-msgstr "Оберіть ліцензію"
+msgstr "Оберіть ліцензію."
 
 #. TRANS: Form legend in the license admin panel.
 msgid "License details"
@@ -3015,9 +2992,8 @@ msgid "URL for an image to display with the license."
 msgstr "URL-адреса зображення (логотипу) для показу поруч з ліцензією"
 
 #. TRANS: Button title in the license admin panel.
-#, fuzzy
 msgid "Save license settings."
-msgstr "Зберегти налаштування ліцензії"
+msgstr "Зберегти налаштування ліцензії."
 
 #. TRANS: Client error displayed when trying to log in while already logged in.
 #. TRANS: Client error displayed trying to use "one time password login" when already logged in.
@@ -3052,7 +3028,6 @@ msgstr ""
 "користування!"
 
 #. TRANS: Button text for log in on login page.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Login"
 msgstr "Увійти"
@@ -3152,7 +3127,6 @@ msgstr "Нове повідомлення"
 
 #. TRANS: Client error displayed trying to send a direct message to a user while sender and
 #. TRANS: receiver are not subscribed to each other.
-#, fuzzy
 msgid "You cannot send a message to this user."
 msgstr "Ви не можете надіслати повідомлення цьому користувачеві."
 
@@ -3703,25 +3677,23 @@ msgstr "Користувачі з особистим теґом «%1$s» — с
 #. TRANS: Page title for AJAX form return when a disabling a plugin.
 msgctxt "plugin"
 msgid "Disabled"
-msgstr ""
+msgstr "Вимкнений"
 
 #. TRANS: Client error displayed trying to perform any request method other than POST.
 #. TRANS: Do not translate POST.
 msgid "This action only accepts POST requests."
 msgstr "Ця дія приймає лише запити POST."
 
-#, fuzzy
 msgid "You cannot administer plugins."
-msgstr "Ви не можете видаляти користувачів."
+msgstr "Ви не можете керувати додатками."
 
-#, fuzzy
 msgid "No such plugin."
-msgstr "Немає такої сторінки."
+msgstr "Немає такого додатку."
 
 #. TRANS: Page title for AJAX form return when enabling a plugin.
 msgctxt "plugin"
 msgid "Enabled"
-msgstr ""
+msgstr "Увімкнений"
 
 #. TRANS: Tab and title for plugins admin panel.
 #. TRANS: Menu item for site administration
@@ -3734,15 +3706,18 @@ msgid ""
 "\"http://status.net/wiki/Plugins\">online plugin documentation</a> for more "
 "details."
 msgstr ""
+"Додатки можна увімкнути та налаштувати вручну. Перегляньте <a href=\"http://"
+"status.net/wiki/Plugins\">документацію щодо цього</a>, аби отримати більше "
+"відомостей."
 
 #. TRANS: Admin form section header
-#, fuzzy
 msgid "Default plugins"
-msgstr "Мова за замовчуванням"
+msgstr "Додатки за замовчуванням"
 
 msgid ""
 "All default plugins have been disabled from the site's configuration file."
 msgstr ""
+"Всі додатки за замовчуванням було вимкнено у файлі конфігурації даного сайту."
 
 msgid "Invalid notice content."
 msgstr "Недійсний зміст допису."
@@ -4133,13 +4108,12 @@ msgstr "Помилка в налаштуваннях користувача."
 msgid "New password successfully saved. You are now logged in."
 msgstr "Новий пароль успішно збережено. Тепер ви увійшли."
 
-#, fuzzy
 msgid "No id parameter"
-msgstr "Немає ID аргументу."
+msgstr "Немає параметру ID."
 
-#, fuzzy, php-format
+#, php-format
 msgid "No such file \"%d\""
-msgstr "Такого файлу немає."
+msgstr "Немає такого файлу «%d»"
 
 msgid "Sorry, only invited people can register."
 msgstr ""
@@ -5293,9 +5267,8 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "Ліцензія «%1$s» не відповідає ліцензії сайту «%2$s»."
 
-#, fuzzy
 msgid "URL settings"
-msgstr "Налаштування ІМ"
+msgstr "Налаштування URL"
 
 #. TRANS: Instructions for tab "Other" in user profile settings.
 msgid "Manage various other options."
@@ -5307,12 +5280,11 @@ msgstr "Керування деякими іншими опціями."
 msgid " (free service)"
 msgstr " (вільний сервіс)"
 
-#, fuzzy
 msgid "[none]"
-msgstr "Пусто"
+msgstr "[пусто]"
 
 msgid "[internal]"
-msgstr ""
+msgstr "[внутрішній]"
 
 #. TRANS: Label for dropdown with URL shortener services.
 msgid "Shorten URLs with"
@@ -5323,31 +5295,34 @@ msgid "Automatic shortening service to use."
 msgstr "Доступні сервіси."
 
 msgid "URL longer than"
-msgstr ""
+msgstr "URL-адреса, довша за"
 
 msgid "URLs longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адреси, довші за це значення, будуть скорочуватись (0 — завжди "
+"скорочувати)."
 
 msgid "Text longer than"
-msgstr ""
+msgstr "Текст, довший за"
 
 msgid ""
 "URLs in notices longer than this will be shortened, 0 means always shorten."
 msgstr ""
+"URL-адреси в дописах, довших за це значення, будуть скорочуватись (0 — "
+"завжди скорочувати)."
 
 #. TRANS: Form validation error for form "Other settings" in user profile.
 msgid "URL shortening service is too long (maximum 50 characters)."
 msgstr "Сервіс скорочення URL-адрес надто довгий (50 символів максимум)."
 
 msgid "Invalid number for max url length."
-msgstr ""
+msgstr "Невірне значення параметру максимальної довжини URL-адреси."
 
-#, fuzzy
 msgid "Invalid number for max notice length."
-msgstr "Недійсний зміст допису."
+msgstr "Невірне значення параметру максимальної довжини допису."
 
 msgid "Error saving user URL shortening preferences."
-msgstr ""
+msgstr "Помилка при збереженні налаштувань сервісу скорочення URL-адрес."
 
 #. TRANS: User admin panel title
 msgctxt "TITLE"
@@ -5547,9 +5522,8 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr "Поласуйте бутербродом!"
 
-#, fuzzy
 msgid "Design settings"
-msgstr "Зберегти налаштування сайту"
+msgstr "Налаштування дизайну"
 
 msgid "View profile designs"
 msgstr "Переглядати дизайн користувачів"
@@ -5557,9 +5531,8 @@ msgstr "Переглядати дизайн користувачів"
 msgid "Show or hide profile designs."
 msgstr "Показувати або приховувати дизайни сторінок окремих користувачів."
 
-#, fuzzy
 msgid "Background file"
-msgstr "Фон"
+msgstr "Файл фону"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #, php-format
@@ -5964,91 +5937,17 @@ msgid "Show more"
 msgstr "Розгорнути"
 
 #. TRANS: Inline reply form submit button: submits a reply comment.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Reply"
 msgstr "Відповісти"
 
 #. TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
 msgid "Write a reply..."
-msgstr ""
-
-msgid "Home"
-msgstr "Веб-сторінка"
+msgstr "Пише відповідь..."
 
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s стрічка"
-
-msgid "Your profile"
-msgstr "Профіль спільноти"
-
-msgid "Public"
-msgstr "Загал"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "Пошук людей на цьому сайті"
-
-msgid "Settings"
-msgstr "Налаштування СМС"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "Змінити налаштування профілю"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "Конфігурація користувача"
-
-msgid "Logout"
-msgstr "Вийти"
-
-msgid "Logout from the site"
-msgstr "Вийти з сайту"
-
-msgid "Login to the site"
-msgstr "Увійти на сайт"
-
-msgid "Search"
-msgstr "Пошук"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "Пошук"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "Допомога"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "Про"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "ЧаП"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "Умови"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "Приватність"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "Джерело"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "Контакт"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "Бедж"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6269,9 +6168,8 @@ msgid "Set site license"
 msgstr "Зазначте ліцензію сайту"
 
 #. TRANS: Menu item title/tooltip
-#, fuzzy
 msgid "Plugins configuration"
-msgstr "Конфігурація шляху"
+msgstr "Налаштування додатків"
 
 #. TRANS: Client error 401.
 msgid "API resource requires read-write access, but you only have read access."
@@ -6528,9 +6426,8 @@ msgstr ""
 "Дописи: %3$s"
 
 #. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
-#, fuzzy
 msgid "Could not create favorite: already favorited."
-msgstr "Не можна позначити як обране."
+msgstr "Не можна позначити як обране: вже обране."
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 msgid "Notice marked as fave."
@@ -6846,13 +6743,18 @@ msgstr "Іти до файлу інсталяції."
 msgid "Database error"
 msgstr "Помилка бази даних"
 
+msgid "Home"
+msgstr "Веб-сторінка"
+
+msgid "Public"
+msgstr "Загал"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "Видалити цього користувача"
 
-#, fuzzy
 msgid "Change design"
-msgstr "Зберегти дизайн"
+msgstr "Змінити дизайн"
 
 #. TRANS: Fieldset legend on profile design page to change profile page colours.
 msgid "Change colours"
@@ -7156,6 +7058,11 @@ msgid ""
 "user isn't you, or if you didn't request this confirmation, just ignore this "
 "message."
 msgstr ""
+"Користувач «%s» на сайті %s повідомив, що псевдонім %s належить йому. Якщо це "
+"дійсно так, ви можете підтвердити це просто перейшовши за наступною ланкою: %"
+"s. (Якщо ви не можете натиснути на посилання, то скопіюйте адресу до "
+"адресного рядка вашого веб-оглядача.) Якщо ви не є згаданим користувачем, не "
+"підтверджуйте нічого, просто проігноруйте це повідомлення."
 
 #, php-format
 msgid "Unknown inbox source %d."
@@ -7529,6 +7436,18 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише ви."
 
+msgid "Inbox"
+msgstr "Вхідні"
+
+msgid "Your incoming messages"
+msgstr "Ваші вхідні повідомлення"
+
+msgid "Outbox"
+msgstr "Вихідні"
+
+msgid "Your sent messages"
+msgstr "Надіслані вами повідомлення"
+
 msgid "Could not parse message."
 msgstr "Не можна розібрати повідомлення."
 
@@ -7605,6 +7524,20 @@ msgstr "Повідомлення"
 msgid "from"
 msgstr "з"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "Вам не дозволено видаляти цю спільноту."
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "Не видаляти цього користувача."
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "Псевдонім не може бути порожнім."
@@ -7631,9 +7564,8 @@ msgid "Attach"
 msgstr "Вкласти"
 
 #. TRANS: Title for input field to attach a file to a notice.
-#, fuzzy
 msgid "Attach a file."
-msgstr "Вкласти файл"
+msgstr "Вкласти файл."
 
 #. TRANS: Field label to add location to a notice.
 msgid "Share my location"
@@ -7720,24 +7652,15 @@ msgstr "Дублікат допису."
 msgid "Couldn't insert new subscription."
 msgstr "Не вдалося додати нову підписку."
 
+msgid "Your profile"
+msgstr "Профіль спільноти"
+
 msgid "Replies"
 msgstr "Відповіді"
 
 msgid "Favorites"
 msgstr "Обрані"
 
-msgid "Inbox"
-msgstr "Вхідні"
-
-msgid "Your incoming messages"
-msgstr "Ваші вхідні повідомлення"
-
-msgid "Outbox"
-msgstr "Вихідні"
-
-msgid "Your sent messages"
-msgstr "Надіслані вами повідомлення"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7750,16 +7673,40 @@ msgstr "Невідомо"
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Disable"
-msgstr ""
+msgstr "Вимкнути"
 
 #. TRANS: Plugin admin panel controls
 msgctxt "plugin"
 msgid "Enable"
-msgstr ""
+msgstr "Увімкнути"
 
 msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
-msgstr ""
+msgstr "(Опис додатку недоступний, якщо даний додаток вимкнутий.)"
+
+msgid "Settings"
+msgstr "Налаштування СМС"
+
+msgid "Change your personal settings"
+msgstr "Змінити персональні налаштування"
+
+msgid "Site configuration"
+msgstr "Конфігурація сайту"
+
+msgid "Logout"
+msgstr "Вийти"
+
+msgid "Logout from the site"
+msgstr "Вийти з сайту"
+
+msgid "Login to the site"
+msgstr "Увійти на сайт"
+
+msgid "Search"
+msgstr "Пошук"
+
+msgid "Search the site"
+msgstr "Пошук на сайті"
 
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
@@ -7869,6 +7816,39 @@ msgstr "Пошук дописів за змістом"
 msgid "Find groups on this site"
 msgstr "Пошук спільнот на цьому сайті"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "Допомога"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "Про"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "ЧаП"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "Умови"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "Приватність"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "Джерело"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "Контакт"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "Бедж"
+
 msgid "Untitled section"
 msgstr "Розділ без заголовку"
 
@@ -7894,7 +7874,7 @@ msgid "URL"
 msgstr "URL"
 
 msgid "URL shorteners"
-msgstr ""
+msgstr "Скорочення URL"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "Оновлення за допомогою служби миттєвих повідомлень (ІМ)"
@@ -7997,12 +7977,12 @@ msgstr "Тема містить файл типу «.%s», який є непр
 msgid "Error opening theme archive."
 msgstr "Помилка при відкритті архіву з темою."
 
-#, fuzzy, php-format
+#, php-format
 msgid "Show %d reply"
 msgid_plural "Show all %d replies"
-msgstr[0] "Розгорнути"
-msgstr[1] "Розгорнути"
-msgstr[2] "Розгорнути"
+msgstr[0] "Показати %d відповідь"
+msgstr[1] "Показати %d відповіді"
+msgstr[2] "Показати %d відповідей"
 
 msgid "Top posters"
 msgstr "Топ-дописувачі"
@@ -8160,19 +8140,8 @@ msgstr "Неправильний XML, корінь XRD відсутній."
 msgid "Getting backup from file '%s'."
 msgstr "Отримання резервної копії файлу «%s»."
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "Повне ім’я задовге (255 знаків максимум)"
+#~ msgid "Friends timeline"
+#~ msgstr "Стрічка друзів"
 
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "опис надто довгий (%d знаків максимум)."
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "Розташування надто довге (255 знаків максимум)."
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "Забагато додаткових імен! Максимум становить %d."
-
-#, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "Зміст"
+#~ msgid "Everyone on this site"
+#~ msgstr "Всі на цьому сайті"
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index c79258d3ca..c8367a9bd1 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -15,18 +15,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:42+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:35+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-03-03 17:59:19+0000\n"
+"X-POT-Import-Date: 2011-03-06 02:16:47+0000\n"
 
 #. TRANS: Page title for Access admin panel that allows configuring site access.
 #. TRANS: Menu item for site administration
@@ -5753,82 +5753,9 @@ msgstr "回复"
 msgid "Write a reply..."
 msgstr ""
 
-msgid "Home"
-msgstr "主页"
-
 #, fuzzy
-msgid "Friends timeline"
-msgstr "%s的时间线"
-
-msgid "Your profile"
-msgstr "小组资料"
-
-msgid "Public"
-msgstr "公共"
-
-#, fuzzy
-msgid "Everyone on this site"
-msgstr "搜索本站用户"
-
-msgid "Settings"
-msgstr "SMS 设置"
-
-#, fuzzy
-msgid "Change your personal settings"
-msgstr "修改你的个人信息"
-
-#, fuzzy
-msgid "Site configuration"
-msgstr "用户配置"
-
-msgid "Logout"
-msgstr "登出"
-
-msgid "Logout from the site"
-msgstr "从网站登出"
-
-msgid "Login to the site"
-msgstr "登录这个网站"
-
-msgid "Search"
-msgstr "搜索"
-
-#, fuzzy
-msgid "Search the site"
-msgstr "搜索帮助"
-
-#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-msgid "Help"
-msgstr "帮助"
-
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-msgid "About"
-msgstr "关于"
-
-#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-msgid "FAQ"
-msgstr "FAQ"
-
-#. TRANS: Secondary navigation menu option leading to Terms of Service.
-msgid "TOS"
-msgstr "条款"
-
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-msgid "Privacy"
-msgstr "隐私"
-
-#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-msgid "Source"
-msgstr "源码"
-
-#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgid "Contact"
-msgstr "联系"
-
-#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-msgid "Badge"
-msgstr "挂件"
+msgid "Status"
+msgstr "StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #. TRANS: Text between [] is a link description, text between () is the link itself.
@@ -6598,6 +6525,12 @@ msgstr "去安装程序。"
 msgid "Database error"
 msgstr "数据库错误"
 
+msgid "Home"
+msgstr "主页"
+
+msgid "Public"
+msgstr "公共"
+
 #. TRANS: Description of form for deleting a user.
 msgid "Delete this user"
 msgstr "删除这个用户"
@@ -7256,6 +7189,18 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
+msgid "Inbox"
+msgstr "收件箱"
+
+msgid "Your incoming messages"
+msgstr "你收到的私信"
+
+msgid "Outbox"
+msgstr "发件箱"
+
+msgid "Your sent messages"
+msgstr "你发送的私信"
+
 msgid "Could not parse message."
 msgstr "无法解析消息。"
 
@@ -7329,6 +7274,20 @@ msgstr "消息"
 msgid "from"
 msgstr "通过"
 
+msgid "Can't get author for activity."
+msgstr ""
+
+#, fuzzy
+msgid "Bookmark not posted to this group."
+msgstr "你不能删除这个小组。"
+
+#, fuzzy
+msgid "Object not posted to this user."
+msgstr "请不要删除该用户。"
+
+msgid "Don't know how to handle this kind of target."
+msgstr ""
+
 #. TRANS: Validation error in form for registration, profile and group settings, etc.
 msgid "Nickname cannot be empty."
 msgstr "昵称不能为空。"
@@ -7440,24 +7399,15 @@ msgstr "复制消息。"
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
+msgid "Your profile"
+msgstr "小组资料"
+
 msgid "Replies"
 msgstr "答复"
 
 msgid "Favorites"
 msgstr "收藏夹"
 
-msgid "Inbox"
-msgstr "收件箱"
-
-msgid "Your incoming messages"
-msgstr "你收到的私信"
-
-msgid "Outbox"
-msgstr "发件箱"
-
-msgid "Your sent messages"
-msgstr "你发送的私信"
-
 #. TRANS: Title for personal tag cloud section. %s is a user nickname.
 #, php-format
 msgid "Tags in %s's notices"
@@ -7481,6 +7431,33 @@ msgctxt "plugin-description"
 msgid "(Plugin descriptions unavailable when disabled.)"
 msgstr ""
 
+msgid "Settings"
+msgstr "SMS 设置"
+
+#, fuzzy
+msgid "Change your personal settings"
+msgstr "修改你的个人信息"
+
+#, fuzzy
+msgid "Site configuration"
+msgstr "用户配置"
+
+msgid "Logout"
+msgstr "登出"
+
+msgid "Logout from the site"
+msgstr "从网站登出"
+
+msgid "Login to the site"
+msgstr "登录这个网站"
+
+msgid "Search"
+msgstr "搜索"
+
+#, fuzzy
+msgid "Search the site"
+msgstr "搜索帮助"
+
 #. TRANS: H2 text for user subscription statistics.
 #. TRANS: Label for user statistics.
 msgid "Subscriptions"
@@ -7589,6 +7566,39 @@ msgstr "搜索消息内容"
 msgid "Find groups on this site"
 msgstr "搜索本站小组"
 
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+msgid "Help"
+msgstr "帮助"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+msgid "About"
+msgstr "关于"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+msgid "FAQ"
+msgstr "FAQ"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+msgid "TOS"
+msgstr "条款"
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+msgid "Privacy"
+msgstr "隐私"
+
+#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
+msgid "Source"
+msgstr "源码"
+
+#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgid "Contact"
+msgstr "联系"
+
+#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
+msgid "Badge"
+msgstr "挂件"
+
 msgid "Untitled section"
 msgstr "无标题章节"
 
@@ -7859,19 +7869,10 @@ msgstr "不合法的XML, 缺少XRD根"
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
 
-#~ msgid "Full name is too long (max 255 chars)."
-#~ msgstr "全名过长(不能超过 255 个字符)。"
-
-#~ msgid "description is too long (max %d chars)."
-#~ msgstr "描述过长(不能超过%d个字符)。"
-
-#~ msgid "Location is too long (max 255 chars)."
-#~ msgstr "位置过长(不能超过255个字符)。"
-
-#~ msgid "Too many aliases! Maximum %d."
-#~ msgstr "太多别名了！最多%d 个。"
+#, fuzzy
+#~ msgid "Friends timeline"
+#~ msgstr "%s的时间线"
 
 #, fuzzy
-#~ msgctxt "BUTTON"
-#~ msgid "Comment"
-#~ msgstr "内容"
+#~ msgid "Everyone on this site"
+#~ msgstr "搜索本站用户"
diff --git a/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..88b9c40056
--- /dev/null
+++ b/plugins/AccountManager/locale/pt/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:36+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr ""
+"O plugin do Gestor da Conta implementa a especificação do Gestor da Conta."
diff --git a/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
new file mode 100644
index 0000000000..a288252762
--- /dev/null
+++ b/plugins/AccountManager/locale/uk/LC_MESSAGES/AccountManager.po
@@ -0,0 +1,27 @@
+# Translation of StatusNet - AccountManager to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - AccountManager\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:36+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:46+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-accountmanager\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid ""
+"The Account Manager plugin implements the Account Manager specification."
+msgstr "Додаток Account Manager реалізує специфікацію керування акаунтом."
diff --git a/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..c535066116
--- /dev/null
+++ b/plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:39+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Envie-me uma mensagem para colocar uma notícia"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"O plugin AIM permite aos utilizadores enviar e receber avisos sobre a rede "
+"AIM."
diff --git a/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
new file mode 100644
index 0000000000..61214acf2e
--- /dev/null
+++ b/plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
@@ -0,0 +1,34 @@
+# Translation of StatusNet - Aim to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Aim\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:39+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:12:48+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-aim\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Надішліть мені повідомлення, щоб опублікувати свій допис"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid ""
+"The AIM plugin allows users to send and receive notices over the AIM network."
+msgstr ""
+"Додаток AIM дозволяє користувачам надсилати і отримувати дописи у мережі AIM."
diff --git a/plugins/Bookmark/locale/Bookmark.pot b/plugins/Bookmark/locale/Bookmark.pot
index 78fa302e1e..c7fc76af60 100644
--- a/plugins/Bookmark/locale/Bookmark.pot
+++ b/plugins/Bookmark/locale/Bookmark.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
+"POT-Creation-Date: 2011-03-08 01:03+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"
@@ -16,10 +16,14 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: BookmarkPlugin.php:458
+#: BookmarkPlugin.php:233
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+#: BookmarkPlugin.php:639
+msgid "Bookmark"
+msgstr ""
+
 #: importdelicious.php:340
 msgctxt "BUTTON"
 msgid "Upload"
diff --git a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
index da0f636160..c0ff37727e 100644
--- a/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/br/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Breton <http://translatewiki.net/wiki/Portal:br>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Enporzhiañ"
diff --git a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
index 46a110b549..f8913d4fc4 100644
--- a/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/de/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Einfache Erweiterung zur Unterstützung von Lesezeichen."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Hochladen"
diff --git a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
index 1cf80a5740..9836e1b7ca 100644
--- a/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/fr/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Simple extension pour supporter les signets."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Téléverser"
diff --git a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
index fa9f1940b1..7513e1830e 100644
--- a/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ia/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Extension simple pro supportar marcapaginas."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Incargar"
diff --git a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
index d589e32af7..8621cf3093 100644
--- a/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/mk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:56+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Прост додаток за поддршка на обележувачи."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Подигни"
diff --git a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
index e452765aa8..df27d6b70d 100644
--- a/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/my/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Burmese <http://translatewiki.net/wiki/Portal:my>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: my\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Upload တင်ရန်"
diff --git a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
index a759a059b8..ca207809ec 100644
--- a/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/nl/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Eenvoudige extensie voor de ondersteuning van bladwijzers."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Uploaden"
diff --git a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
index 9962ee5ca5..318a8496c5 100644
--- a/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/ru/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Russian <http://translatewiki.net/wiki/Portal:ru>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Загрузить"
diff --git a/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
index 48065a1fc1..65e6f37601 100644
--- a/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/te/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Telugu <http://translatewiki.net/wiki/Portal:te>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -24,6 +24,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr ""
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "ఎక్కించు"
diff --git a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
index 7eaa40faf2..b23106c113 100644
--- a/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/uk/LC_MESSAGES/Bookmark.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "Простий додаток, що підтримує додавання закладок."
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "Завантажити"
diff --git a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
index 53bdbd96a8..24139d495b 100644
--- a/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
+++ b/plugins/Bookmark/locale/zh_CN/LC_MESSAGES/Bookmark.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Bookmark\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:36:57+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:50+0000\n"
 "Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:43:07+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:12:57+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-plugin-bookmark\n"
@@ -25,6 +25,9 @@ msgstr ""
 msgid "Simple extension for supporting bookmarks."
 msgstr "支持书签的简单扩展。"
 
+msgid "Bookmark"
+msgstr ""
+
 msgctxt "BUTTON"
 msgid "Upload"
 msgstr "上载"
diff --git a/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
new file mode 100644
index 0000000000..112d9f3bdf
--- /dev/null
+++ b/plugins/Disqus/locale/pt/LC_MESSAGES/Disqus.po
@@ -0,0 +1,45 @@
+# Translation of StatusNet - Disqus to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Disqus\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:05:58+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:19+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-disqus\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: User notification that JavaScript is required for Disqus comment display.
+#, php-format
+msgid ""
+"Please enable JavaScript to view the [comments powered by Disqus](http://"
+"disqus.com/?ref_noscript=%s)."
+msgstr ""
+
+#. TRANS: This message is followed by a Disqus logo. Alt text is "Disqus".
+msgid "Comments powered by "
+msgstr "Comentários criados por "
+
+#. TRANS: Plugin supplied feature for Disqus comments to notices.
+msgid "Comments"
+msgstr "Comentários"
+
+#. TRANS: Plugin description.
+msgid ""
+"Use <a href=\"http://disqus.com/\">Disqus</a> to add commenting to notice "
+"pages."
+msgstr ""
+"Usa o <a href=\"http://disqus.com/\">Disqus</a> para adicionar comentários "
+"ás páginas."
diff --git a/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
new file mode 100644
index 0000000000..b98ce66ca3
--- /dev/null
+++ b/plugins/ExtendedProfile/locale/uk/LC_MESSAGES/ExtendedProfile.po
@@ -0,0 +1,98 @@
+# Translation of StatusNet - ExtendedProfile to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ExtendedProfile\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:03+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:22+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-extendedprofile\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "UI extensions for additional profile fields."
+msgstr "Розширення інтерфейсу для додаткових полів у профілі."
+
+#. TRANS: Link description in user account settings menu.
+msgid "Details"
+msgstr "Деталі"
+
+msgid "More details..."
+msgstr "Детальніше..."
+
+msgid "Personal"
+msgstr "Профіль"
+
+msgid "Full name"
+msgstr "Повне ім’я"
+
+msgid "Title"
+msgstr "Назва"
+
+msgid "Manager"
+msgstr "Керування"
+
+msgid "Location"
+msgstr "Розташування"
+
+msgid "Bio"
+msgstr "Про себе"
+
+msgid "Tags"
+msgstr "Теґи"
+
+msgid "Contact"
+msgstr "Контакти"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "IM"
+msgstr "ІМ"
+
+msgid "Websites"
+msgstr "Сайти"
+
+msgid "Birthday"
+msgstr "День народження"
+
+msgid "Spouse's name"
+msgstr "Ім’я дружини/чоловіка:"
+
+msgid "Kids' names"
+msgstr "Імена дітей"
+
+msgid "Work experience"
+msgstr "Досвід роботи"
+
+msgid "Employer"
+msgstr "Роботодавець"
+
+msgid "Education"
+msgstr "Освіта"
+
+msgid "Institution"
+msgstr "Установа"
+
+#. TRANS: Link title for link on user profile.
+msgid "Edit extended profile settings"
+msgstr "Змінити розширені налаштування профілю"
+
+#. TRANS: Link text for link on user profile.
+msgid "Edit"
+msgstr "Змінити"
+
+msgid "Extended profile settings"
+msgstr "Розширені налаштування профілю"
diff --git a/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
new file mode 100644
index 0000000000..50f3192384
--- /dev/null
+++ b/plugins/ForceGroup/locale/pt/LC_MESSAGES/ForceGroup.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - ForceGroup to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ForceGroup\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:09+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:25+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-forcegroup\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Server exception.
+#. TRANS: %1$s is a user nickname, %2$s is a group nickname.
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "Não foi possível juntar o usuário %1$s ao grupo %2$s."
+
+#. TRANS: Plugin description.
+msgid ""
+"Allows forced group memberships and forces all notices to appear in groups "
+"that users were forced in."
+msgstr ""
+"Permite que membros forçados do grupo forcem com que todos os anúncios "
+"apareçam em grupos em que os utilizadores foram forçados."
diff --git a/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po b/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
new file mode 100644
index 0000000000..c2be92e199
--- /dev/null
+++ b/plugins/GroupPrivateMessage/locale/pt/LC_MESSAGES/GroupPrivateMessage.po
@@ -0,0 +1,52 @@
+# Translation of StatusNet - GroupPrivateMessage to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - GroupPrivateMessage\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:16+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:29+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-groupprivatemessage\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Inbox"
+msgstr "Caixa de Entrada"
+
+msgid "Private messages for this group"
+msgstr "Mensagens privadas para este grupo"
+
+msgid "Allow posting DMs to a group."
+msgstr "Permitir pastagens DMs a um grupo."
+
+msgid "This group has not received any private messages."
+msgstr "Este grupo ainda não recebeu nenhuma mensagem privada."
+
+#. TRANS: Instructions for user inbox page.
+msgid ""
+"This is the group inbox, which lists all incoming private messages for this "
+"group."
+msgstr ""
+"Esta é a caixa de entrada do grupo, que lista todas as mensagens privadas "
+"recebidas para este grupo."
+
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Enviar"
+
+#, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "É muito longo. Máx. tamanho da mensagem é %d caracteres."
+msgstr[1] "É muito longo. Máx. tamanho da mensagem é %d caracteres."
diff --git a/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
new file mode 100644
index 0000000000..3d027ce23f
--- /dev/null
+++ b/plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
@@ -0,0 +1,39 @@
+# Translation of StatusNet - Irc to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Irc\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:19+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-irc\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid ""
+"The IRC plugin allows users to send and receive notices over an IRC network."
+msgstr ""
+"Додаток IRC дозволяє користувачам надсилати і отримувати дописи у мережі IRC."
+
+#, php-format
+msgid "Could not increment attempts count for %d"
+msgstr "Не вдалося збільшити кількість спроб для %d"
+
+msgid "Your nickname is not registered so IRC connectivity cannot be enabled"
+msgstr ""
+"Ваш псевдонім не зареєстровано і тому підключення до IRC увімкнути неможливо"
diff --git a/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
new file mode 100644
index 0000000000..f69ba1a6bd
--- /dev/null
+++ b/plugins/Linkback/locale/pt/LC_MESSAGES/Linkback.po
@@ -0,0 +1,33 @@
+# Translation of StatusNet - Linkback to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Linkback\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:23+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:17:36+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-linkback\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"Notify blog authors when their posts have been linked in microblog notices "
+"using <a href=\"http://www.hixie.ch/specs/pingback/pingback\">Pingback</a> "
+"or <a href=\"http://www.movabletype.org/docs/mttrackback.html\">Trackback</"
+"a> protocols."
+msgstr ""
+"Notificar os autores do blog quando as suas postagens forem vinculadas em "
+"anúncios de microblog usando os protocolos <a href=\"http://www.hixie.ch/"
+"specs/pingback/pingback\">Pingback</a> ou <a href=\"http://www.movabletype."
+"org/docs/mttrackback.html\">Trackback</a>."
diff --git a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
index 7f3c9d8a35..d88f8d4449 100644
--- a/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
+++ b/plugins/MobileProfile/locale/uk/LC_MESSAGES/MobileProfile.po
@@ -9,13 +9,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - MobileProfile\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-06 02:34+0100\n"
-"PO-Revision-Date: 2011-03-06 01:37:37+0000\n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:31+0000\n"
 "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-POT-Import-Date: 2011-03-03 17:49:34+0000\n"
-"X-Generator: MediaWiki 1.18alpha (r83348); Translate extension (2011-03-04)\n"
+"X-POT-Import-Date: 2011-03-06 02:18:32+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: #out-statusnet-plugin-mobileprofile\n"
@@ -63,11 +63,11 @@ msgstr "Вкласти файл"
 
 #. TRANS: Link to switch site layout from mobile to desktop mode. Appears at very bottom of page.
 msgid "Switch to desktop site layout."
-msgstr ""
+msgstr "Перемкнути вигляд сайту на варіант для робочого столу."
 
 #. TRANS: Link to switch site layout from desktop to mobile mode. Appears at very bottom of page.
 msgid "Switch to mobile site layout."
-msgstr ""
+msgstr "Перемкнути вигляд сайту на варіант для мобільних пристроїв."
 
 msgid "XHTML MobileProfile output for supporting user agents."
 msgstr ""
diff --git a/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
new file mode 100644
index 0000000000..248354e442
--- /dev/null
+++ b/plugins/ModHelper/locale/pt/LC_MESSAGES/ModHelper.po
@@ -0,0 +1,28 @@
+# Translation of StatusNet - ModHelper to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - ModHelper\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:32+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:32+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-modhelper\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid ""
+"Lets users who have been manually marked as \"modhelper\"s silence accounts."
+msgstr ""
+"Permite que os usuários que tenham sido manualmente marcados como \"modhelper"
+"\" silenciem contas."
diff --git a/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po b/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..3dc5f24c79
--- /dev/null
+++ b/plugins/Msn/locale/pt/LC_MESSAGES/Msn.po
@@ -0,0 +1,29 @@
+# Translation of StatusNet - Msn to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:33+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
diff --git a/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
new file mode 100644
index 0000000000..eb3a9b0a2b
--- /dev/null
+++ b/plugins/Msn/locale/uk/LC_MESSAGES/Msn.po
@@ -0,0 +1,31 @@
+# Translation of StatusNet - Msn to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Msn\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:33+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-msn\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid ""
+"The MSN plugin allows users to send and receive notices over the MSN network."
+msgstr ""
+"Додаток MSN дозволяє користувачам надсилати і отримувати дописи у мережі MSN."
diff --git a/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po b/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
new file mode 100644
index 0000000000..2e3d27a55d
--- /dev/null
+++ b/plugins/NoticeTitle/locale/pt/LC_MESSAGES/NoticeTitle.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - NoticeTitle to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - NoticeTitle\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:06:36+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:18:34+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-noticetitle\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Adds optional titles to notices."
+msgstr ""
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
diff --git a/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
new file mode 100644
index 0000000000..c8e44bc835
--- /dev/null
+++ b/plugins/StrictTransportSecurity/locale/uk/LC_MESSAGES/StrictTransportSecurity.po
@@ -0,0 +1,30 @@
+# Translation of StatusNet - StrictTransportSecurity to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - StrictTransportSecurity\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:11+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:33+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-stricttransportsecurity\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid ""
+"The Strict Transport Security plugin implements the Strict Transport "
+"Security header, improving the security of HTTPS only sites."
+msgstr ""
+"Додаток Strict Transport Security реалізує режим суворої безпеки, "
+"забезпечуючи безпеку лише для https-сайтів."
diff --git a/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..f3a2968fd0
--- /dev/null
+++ b/plugins/Xmpp/locale/pt/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,35 @@
+# Translation of StatusNet - Xmpp to Portuguese (Português)
+# Exported from translatewiki.net
+#
+# Author: SandroHc
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:28+0000\n"
+"Language-Team: Portuguese <http://translatewiki.net/wiki/Portal:pt>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: pt\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Envia-me uma mensagem para postar uma notícia"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"O plugin XMPP permite aos utilizadores enviar e receber avisos sobre a rede "
+"XMPP/Jabber."
diff --git a/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
new file mode 100644
index 0000000000..2d4117c059
--- /dev/null
+++ b/plugins/Xmpp/locale/uk/LC_MESSAGES/Xmpp.po
@@ -0,0 +1,36 @@
+# Translation of StatusNet - Xmpp to Ukrainian (Українська)
+# Exported from translatewiki.net
+#
+# Author: Boogie
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet - Xmpp\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-08 01:03+0000\n"
+"PO-Revision-Date: 2011-03-08 01:07:28+0000\n"
+"Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POT-Import-Date: 2011-03-06 02:19:41+0000\n"
+"X-Generator: MediaWiki 1.18alpha (r83429); Translate extension (2011-03-07)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: uk\n"
+"X-Message-Group: #out-statusnet-plugin-xmpp\n"
+"Plural-Forms: nplurals=3; plural=(n%10 == 1 && n%100 != 11) ? 0 : ( (n%10 >= "
+"2 && n%10 <= 4 && (n%100 < 10 || n%100 >= 20)) ? 1 : 2 );\n"
+
+msgid "Send me a message to post a notice"
+msgstr "Надішліть мені повідомлення, щоб опублікувати допис"
+
+msgid "XMPP/Jabber/GTalk"
+msgstr "XMPP/Jabber/GTalk"
+
+msgid ""
+"The XMPP plugin allows users to send and receive notices over the XMPP/"
+"Jabber network."
+msgstr ""
+"Додаток XMPP дозволяє користувачам надсилати і отримувати дописи у мережі "
+"XMPP (Jabber)."

From 3438a78c023d84c344200b5f2794c37ead83e539 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Mar 2011 21:28:36 -0800
Subject: [PATCH 15/17] Initial checkin of Poll plugin: micro-app to post mini
 polls/surveys from the notice form.

This version is fairly basic; votes do not (yet) show a reply, they just got in the table. No pretty graphs for the results yet, just text.
The ActivityStream output is temporary and probably should be replaced; the current structures for adding custom data aren't really ready yet (especially since we need to cover JSON and Atom formats, probably pretty differently)

Uses similar system as Bookmark for attaching to notices -- saves a custom URI for an alternate action, which we can then pass in and hook back up to our poll object. This can probably do with a little more simplification in the parent MicroAppPlugin class.

Currently adds two tables:
- poll holds the main poll info: id and URI to associate with the notice, then the question and a text blob with the options.
- poll_response records the selections picked by our nice fellows.

Hopefully no off-by-one bugs left in the selection, but I give no guarantees. ;)
Some todo notes in the README and in doc comments.
---
 plugins/Poll/Poll.php             | 250 +++++++++++++++++++++++++
 plugins/Poll/PollPlugin.php       | 293 ++++++++++++++++++++++++++++++
 plugins/Poll/Poll_response.php    | 110 +++++++++++
 plugins/Poll/README               |  21 +++
 plugins/Poll/newpoll.php          | 193 ++++++++++++++++++++
 plugins/Poll/newpollform.php      | 150 +++++++++++++++
 plugins/Poll/pollresponseform.php | 135 ++++++++++++++
 plugins/Poll/pollresultform.php   | 131 +++++++++++++
 plugins/Poll/respondpoll.php      | 189 +++++++++++++++++++
 plugins/Poll/showpoll.php         | 111 +++++++++++
 10 files changed, 1583 insertions(+)
 create mode 100644 plugins/Poll/Poll.php
 create mode 100644 plugins/Poll/PollPlugin.php
 create mode 100644 plugins/Poll/Poll_response.php
 create mode 100644 plugins/Poll/README
 create mode 100644 plugins/Poll/newpoll.php
 create mode 100644 plugins/Poll/newpollform.php
 create mode 100644 plugins/Poll/pollresponseform.php
 create mode 100644 plugins/Poll/pollresultform.php
 create mode 100644 plugins/Poll/respondpoll.php
 create mode 100644 plugins/Poll/showpoll.php

diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
new file mode 100644
index 0000000000..60ec4399fd
--- /dev/null
+++ b/plugins/Poll/Poll.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Data class to mark notices as bookmarks
+ *
+ * PHP version 5
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, 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')) {
+    exit(1);
+}
+
+/**
+ * For storing the poll options and such
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Poll extends Managed_DataObject
+{
+    public $__table = 'poll'; // table name
+    public $id;          // char(36) primary key not null -> UUID
+    public $profile_id;  // int -> profile.id
+    public $question;    // text
+    public $options;     // text; newline(?)-delimited
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Poll', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
+     *
+     */
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Poll', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Per-notice poll data for Poll plugin',
+            'fields' => array(
+                'id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
+                'uri' => array('type' => 'varchar', 'length' => 255, 'not null' => true),
+                'profile_id' => array('type' => 'int'),
+                'question' => array('type' => 'text'),
+                'options' => array('type' => 'text'),
+                'created' => array('type' => 'datetime', 'not null' => true),
+            ),
+            'primary key' => array('id'),
+            'unique keys' => array(
+                'poll_uri_key' => array('uri'),
+            ),
+        );
+    }
+
+    /**
+     * Get a bookmark based on a notice
+     *
+     * @param Notice $notice Notice to check for
+     *
+     * @return Poll found poll or null
+     */
+
+    function getByNotice($notice)
+    {
+        return self::staticGet('uri', $notice->uri);
+    }
+
+    function getOptions()
+    {
+        return explode("\n", $this->options);
+    }
+
+    function getNotice()
+    {
+        return Notice::staticGet('uri', $this->uri);
+    }
+
+    function bestUrl()
+    {
+        return $this->getNotice()->bestUrl();
+    }
+
+    /**
+     * Get the response of a particular user to this poll, if any.
+     *
+     * @param Profile $profile
+     * @return Poll_response object or null
+     */
+    function getResponse(Profile $profile)
+    {
+        $pr = new Poll_response();
+        $pr->poll_id = $this->id;
+        $pr->profile_id = $profile->id;
+        $pr->find();
+        if ($pr->fetch()) {
+            return $pr;
+        } else {
+            return null;
+        }
+    }
+
+    function countResponses()
+    {
+        $pr = new Poll_response();
+        $pr->poll_id = $this->id;
+        $pr->groupBy('selection');
+        $pr->selectAdd('count(profile_id) as votes');
+        $pr->find();
+
+        $raw = array();
+        while ($pr->fetch()) {
+            $raw[$pr->selection] = $pr->votes;
+        }
+
+        $counts = array();
+        foreach (array_keys($this->getOptions()) as $key) {
+            if (isset($raw[$key])) {
+                $counts[$key] = $raw[$key];
+            } else {
+                $counts[$key] = 0;
+            }
+        }
+        return $counts;
+    }
+
+    /**
+     * Save a new poll notice
+     *
+     * @param Profile $profile
+     * @param string  $question
+     * @param array   $opts (poll responses)
+     *
+     * @return Notice saved notice
+     */
+
+    static function saveNew($profile, $question, $opts, $options=null)
+    {
+        if (empty($options)) {
+            $options = array();
+        }
+
+        $p = new Poll();
+
+        $p->id          = UUID::gen();
+        $p->profile_id  = $profile->id;
+        $p->question    = $question;
+        $p->options     = implode("\n", $opts);
+
+        if (array_key_exists('created', $options)) {
+            $p->created = $options['created'];
+        } else {
+            $p->created = common_sql_now();
+        }
+
+        if (array_key_exists('uri', $options)) {
+            $p->uri = $options['uri'];
+        } else {
+            $p->uri = common_local_url('showpoll',
+                                        array('id' => $p->id));
+        }
+
+        $p->insert();
+
+        $content  = sprintf(_m('Poll: %s %s'),
+                            $question,
+                            $p->uri);
+        $rendered = sprintf(_m('Poll: <a href="%s">%s</a>'),
+                            htmlspecialchars($p->uri),
+                            htmlspecialchars($question));
+
+        $tags    = array('poll');
+        $replies = array();
+
+        $options = array_merge(array('urls' => array(),
+                                     'rendered' => $rendered,
+                                     'tags' => $tags,
+                                     'replies' => $replies,
+                                     'object_type' => PollPlugin::POLL_OBJECT),
+                               $options);
+
+        if (!array_key_exists('uri', $options)) {
+            $options['uri'] = $p->uri;
+        }
+
+        $saved = Notice::saveNew($profile->id,
+                                 $content,
+                                 array_key_exists('source', $options) ?
+                                 $options['source'] : 'web',
+                                 $options);
+
+        return $saved;
+    }
+}
diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
new file mode 100644
index 0000000000..6fa95aa0e7
--- /dev/null
+++ b/plugins/Poll/PollPlugin.php
@@ -0,0 +1,293 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * A plugin to enable social-bookmarking functionality
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Poll plugin main class
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brionv@status.net>
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class PollPlugin extends MicroAppPlugin
+{
+    const VERSION         = '0.1';
+    const POLL_OBJECT     = 'http://apinamespace.org/activitystreams/object/poll';
+
+    /**
+     * Database schema setup
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('poll', Poll::schemaDef());
+        $schema->ensureTable('poll_response', Poll_response::schemaDef());
+        return true;
+    }
+
+    /**
+     * Show the CSS necessary for this plugin
+     *
+     * @param Action $action the action being run
+     *
+     * @return boolean hook value
+     */
+
+    function onEndShowStyles($action)
+    {
+        $action->cssLink($this->path('poll.css'));
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'ShowpollAction':
+        case 'NewpollAction':
+        case 'RespondpollAction':
+            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
+            return false;
+        case 'Poll':
+        case 'Poll_response':
+            include_once $dir.'/'.$cls.'.php';
+            return false;
+        case 'NewPollForm':
+        case 'PollResponseForm':
+        case 'PollResultForm':
+            include_once $dir.'/'.strtolower($cls).'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Map URLs to actions
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onRouterInitialized($m)
+    {
+        $m->connect('main/poll/new',
+                    array('action' => 'newpoll'),
+                    array('id' => '[0-9]+'));
+
+        $m->connect('main/poll/:id/respond',
+                    array('action' => 'respondpoll'),
+                    array('id' => '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'));
+
+        return true;
+    }
+
+    /**
+     * Plugin version data
+     *
+     * @param array &$versions array of version data
+     *
+     * @return value
+     */
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Poll',
+                            'version' => self::VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:Poll',
+                            'rawdescription' =>
+                            _m('Simple extension for supporting basic polls.'));
+        return true;
+    }
+
+    function types()
+    {
+        return array(self::POLL_OBJECT);
+    }
+
+    /**
+     * When a notice is deleted, delete the related Poll
+     *
+     * @param Notice $notice Notice being deleted
+     *
+     * @return boolean hook value
+     */
+
+    function deleteRelated($notice)
+    {
+        $p = Poll::getByNotice($notice);
+
+        if (!empty($p)) {
+            $p->delete();
+        }
+
+        return true;
+    }
+
+    /**
+     * Save a poll from an activity
+     *
+     * @param Profile  $profile  Profile to use as author
+     * @param Activity $activity Activity to save
+     * @param array    $options  Options to pass to bookmark-saving code
+     *
+     * @return Notice resulting notice
+     */
+
+    function saveNoticeFromActivity($activity, $profile, $options=array())
+    {
+        // @fixme
+    }
+
+    function activityObjectFromNotice($notice)
+    {
+        assert($this->isMyNotice($notice));
+
+        $object = new ActivityObject();
+        $object->id      = $notice->uri;
+        $object->type    = self::POLL_OBJECT;
+        $object->title   = 'Poll title';
+        $object->summary = 'Poll summary';
+        $object->link    = $notice->bestUrl();
+
+        $poll = Poll::getByNotice($notice);
+        /**
+         * Adding the poll-specific data. There's no standard in AS for polls,
+         * so we're making stuff up.
+         *
+         * For the moment, using a kind of icky-looking schema that happens to
+         * work with out code for generating both Atom and JSON forms, though
+         * I don't like it:
+         *
+         * <poll:data xmlns:poll="http://apinamespace.org/activitystreams/object/poll"
+         *            question="Who wants a poll question?"
+         *            option1="Option one"
+         *            option2="Option two"
+         *            option3="Option three"></poll:data>
+         *
+         * "poll:data": {
+         *     "xmlns:poll": http://apinamespace.org/activitystreams/object/poll
+         *     "question": "Who wants a poll question?"
+         *     "option1": "Option one"
+         *     "option2": "Option two"
+         *     "option3": "Option three"
+         * }
+         *
+         */
+        // @fixme there's no way to specify an XML node tree here, like <poll><option/><option/></poll>
+        // @fixme there's no way to specify a JSON array or multi-level tree unless you break the XML attribs
+        // @fixme XML node contents don't get shown in JSON
+        $data = array('xmlns:poll' => self::POLL_OBJECT,
+                      'question'   => $poll->question);
+        foreach ($poll->getOptions() as $i => $opt) {
+            $data['option' . ($i + 1)] = $opt;
+        }
+        $object->extra[] = array('poll:data', $data, '');
+        return $object;
+    }
+
+    /**
+     * @fixme WARNING WARNING WARNING parent class closes the final div that we
+     * open here, but we probably shouldn't open it here. Check parent class
+     * and Bookmark plugin for if that's right.
+     */
+    function showNotice($notice, $out)
+    {
+        $user = common_current_user();
+
+        // @hack we want regular rendering, then just add stuff after that
+        $nli = new NoticeListItem($notice, $out);
+        $nli->showNotice();
+
+        $out->elementStart('div', array('class' => 'entry-content poll-content'));
+        $poll = Poll::getByNotice($notice);
+        if ($poll) {
+            if ($user) {
+                $profile = $user->getProfile();
+                $response = $poll->getResponse($profile);
+                if ($response) {
+                    // User has already responded; show the results.
+                    $form = new PollResultForm($poll, $out);
+                } else {
+                    $form = new PollResponseForm($poll, $out);
+                }
+                $form->show();
+            }
+        } else {
+            $out->text('Poll data is missing');
+        }
+        $out->elementEnd('div');
+
+        // @fixme
+        $out->elementStart('div', array('class' => 'entry-content'));
+    }
+
+    function entryForm($out)
+    {
+        return new NewPollForm($out);
+    }
+
+    // @fixme is this from parent?
+    function tag()
+    {
+        return 'poll';
+    }
+
+    function appTitle()
+    {
+        return _m('Poll');
+    }
+}
diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
new file mode 100644
index 0000000000..44bc421c22
--- /dev/null
+++ b/plugins/Poll/Poll_response.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Data class to record responses to polls
+ *
+ * PHP version 5
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, 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')) {
+    exit(1);
+}
+
+/**
+ * For storing the poll options and such
+ *
+ * @category PollPlugin
+ * @package  StatusNet
+ * @author   Brion Vibber <brion@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Poll_response extends Managed_DataObject
+{
+    public $__table = 'poll_response'; // table name
+    public $poll_id;     // char(36) primary key not null -> UUID
+    public $profile_id;  // int -> profile.id
+    public $selection;   // int -> choice #
+    public $created;     // datetime
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return User_greeting_count object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Poll_response', $k, $v);
+    }
+
+    /**
+     * Get an instance by compound key
+     *
+     * This is a utility method to get a single instance with a given set of
+     * key-value pairs. Usually used for the primary key for a compound key; thus
+     * the name.
+     *
+     * @param array $kv array of key-value mappings
+     *
+     * @return Bookmark object found, or null for no hits
+     *
+     */
+
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Poll_response', $kv);
+    }
+
+    /**
+     * The One True Thingy that must be defined and declared.
+     */
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Record of responses to polls',
+            'fields' => array(
+                'poll_id' => array('type' => 'char', 'length' => 36, 'not null' => true, 'description' => 'UUID'),
+                'profile_id' => array('type' => 'int'),
+                'selection' => array('type' => 'int'),
+                'created' => array('type' => 'datetime', 'not null' => true),
+            ),
+            'unique keys' => array(
+                'poll_response_poll_id_profile_id_key' => array('poll_id', 'profile_id'),
+            ),
+            'indexes' => array(
+                'poll_response_profile_id_poll_id_index' => array('profile_id', 'poll_id'),
+            )
+        );
+    }
+}
diff --git a/plugins/Poll/README b/plugins/Poll/README
new file mode 100644
index 0000000000..cd91a03945
--- /dev/null
+++ b/plugins/Poll/README
@@ -0,0 +1,21 @@
+Unfinished basic stuff:
+* make pretty graphs for response counts
+* ActivityStreams output of poll data is temporary; the interfaces need more flexibility
+* ActivityStreams input not done yet
+* need link -> show results in addition to showing results if you already voted
+* way to change/cancel your vote
+
+Known issues:
+* HTTP caching needs fixing on show-poll; may show you old data if you voted after
+
+Things todo:
+* should we allow anonymous responses? or ways for remote profiles to respond locally?
+
+Fancier things todo:
+* make sure backup/restore work
+* make sure ostatus transfer works
+* a way to do poll responses over ostatus directly?
+* allow links, tags, @-references in poll question & answers? or not?
+
+Storage todo:
+* probably separate the options into a table instead of squishing them in a text blob
diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
new file mode 100644
index 0000000000..66386affa9
--- /dev/null
+++ b/plugins/Poll/newpoll.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Add a new Poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  Poll
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Add a new Poll
+ *
+ * @category  Poll
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class NewPollAction extends Action
+{
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+
+    protected $question    = null;
+    protected $options     = array();
+
+    /**
+     * Returns the title of the action
+     *
+     * @return string Action title
+     */
+
+    function title()
+    {
+        return _('New poll');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            throw new ClientException(_("Must be logged in to post a poll."),
+                                      403);
+        }
+
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+        }
+
+        $this->question = $this->trimmed('question');
+        for ($i = 1; $i < 20; $i++) {
+            $opt = $this->trimmed('option' . $i);
+            if ($opt != '') {
+                $this->options[] = $opt;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->newPoll();
+        } else {
+            $this->showPage();
+        }
+
+        return;
+    }
+
+    /**
+     * Add a new Poll
+     *
+     * @return void
+     */
+
+    function newPoll()
+    {
+        try {
+            if (empty($this->question)) {
+                throw new ClientException(_('Poll must have a question.'));
+            }
+
+            if (count($this->options) < 2) {
+                throw new ClientException(_('Poll must have at least two options.'));
+            }
+
+
+            $saved = Poll::saveNew($this->user->getProfile(),
+                                              $this->question,
+                                              $this->options);
+
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        common_redirect($saved->bestUrl(), 303);
+    }
+
+    /**
+     * Show the Poll form
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
+        }
+
+        $form = new NewPollForm($this,
+                                 $this->questions,
+                                 $this->options);
+
+        $form->show();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
new file mode 100644
index 0000000000..fd5f28748b
--- /dev/null
+++ b/plugins/Poll/newpollform.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class NewpollForm extends Form
+{
+
+    protected $question = null;
+    protected $options = array();
+
+    /**
+     * Construct a new poll form
+     *
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct($out=null, $question=null, $options=null)
+    {
+        parent::__construct($out);
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'newpoll-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newpoll');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset', array('id' => 'newpoll-data'));
+        $this->out->elementStart('ul', 'form_data');
+
+        $this->li();
+        $this->out->input('question',
+                          _m('Question'),
+                          $this->question,
+                          _m('What question are people answering?'));
+        $this->unli();
+
+        $max = 5;
+        if (count($this->options) + 1 > $max) {
+            $max = count($this->options) + 2;
+        }
+        for ($i = 0; $i < $max; $i++) {
+            // @fixme make extensible
+            if (isset($this->options[$i])) {
+                $default = $this->options[$i];
+            } else {
+                $default = '';
+            }
+            $this->li();
+            $this->out->input('option' . ($i + 1),
+                              sprintf(_m('Option %d'), $i + 1),
+                              $default);
+            $this->unli();
+        }
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _m('BUTTON', 'Save'));
+    }
+}
diff --git a/plugins/Poll/pollresponseform.php b/plugins/Poll/pollresponseform.php
new file mode 100644
index 0000000000..87340f926f
--- /dev/null
+++ b/plugins/Poll/pollresponseform.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class PollResponseForm extends Form
+{
+    protected $poll;
+
+    /**
+     * Construct a new poll form
+     *
+     * @param Poll $poll
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct(Poll $poll, HTMLOutputter $out)
+    {
+        parent::__construct($out);
+        $this->poll = $poll;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'pollresponse-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('respondpoll', array('id' => $this->poll->id));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $poll = $this->poll;
+        $out = $this->out;
+        $id = "poll-" . $poll->id;
+
+        $out->element('p', 'poll-question', $poll->question);
+        $out->elementStart('ul', 'poll-options');
+        foreach ($poll->getOptions() as $i => $opt) {
+            $out->elementStart('li');
+            $out->elementStart('label');
+            $out->element('input', array('type' => 'radio', 'name' => 'pollselection', 'value' => $i + 1), '');
+            $out->text(' ' . $opt);
+            $out->elementEnd('label');
+            $out->elementEnd('li');
+        }
+        $out->elementEnd('ul');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _m('BUTTON', 'Submit'));
+    }
+}
diff --git a/plugins/Poll/pollresultform.php b/plugins/Poll/pollresultform.php
new file mode 100644
index 0000000000..eace105e0d
--- /dev/null
+++ b/plugins/Poll/pollresultform.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Form for adding a new poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Form to add a new poll thingy
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class PollResultForm extends Form
+{
+    protected $poll;
+
+    /**
+     * Construct a new poll form
+     *
+     * @param Poll $poll
+     * @param HTMLOutputter $out         output channel
+     *
+     * @return void
+     */
+
+    function __construct(Poll $poll, HTMLOutputter $out)
+    {
+        parent::__construct($out);
+        $this->poll = $poll;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'pollresult-form';
+    }
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('respondpoll', array('id' => $this->poll->id));
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $poll = $this->poll;
+        $out = $this->out;
+        $counts = $poll->countResponses();
+
+        $out->element('p', 'poll-question', $poll->question);
+        $out->elementStart('ul', 'poll-options');
+        foreach ($poll->getOptions() as $i => $opt) {
+            $out->elementStart('li');
+            $out->text($counts[$i] . ' ' . $opt);
+            $out->elementEnd('li');
+        }
+        $out->elementEnd('ul');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+    }
+}
diff --git a/plugins/Poll/respondpoll.php b/plugins/Poll/respondpoll.php
new file mode 100644
index 0000000000..8ae31443fc
--- /dev/null
+++ b/plugins/Poll/respondpoll.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Add a new Poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  Poll
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Add a new Poll
+ *
+ * @category  Poll
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class RespondPollAction extends Action
+{
+    protected $user        = null;
+    protected $error       = null;
+    protected $complete    = null;
+
+    protected $poll        = null;
+    protected $selection   = null;
+
+    /**
+     * Returns the title of the action
+     *
+     * @return string Action title
+     */
+
+    function title()
+    {
+        return _m('Poll response');
+    }
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            throw new ClientException(_m("Must be logged in to respond to a poll."),
+                                      403);
+        }
+
+        if ($this->isPost()) {
+            $this->checkSessionToken();
+        }
+
+        $id = $this->trimmed('id');
+        $this->poll = Poll::staticGet('id', $id);
+        if (empty($this->poll)) {
+            throw new ClientException(_m("Invalid or missing poll."), 404);
+        }
+
+        $selection = intval($this->trimmed('pollselection'));
+        if ($selection < 1 || $selection > count($this->poll->getOptions())) {
+            throw new ClientException(_m('Invalid poll selection.'));
+        }
+        $this->selection = $selection;
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        if ($this->isPost()) {
+            $this->respondPoll();
+        } else {
+            $this->showPage();
+        }
+
+        return;
+    }
+
+    /**
+     * Add a new Poll
+     *
+     * @return void
+     */
+
+    function respondPoll()
+    {
+        try {
+            $response = new Poll_response();
+            $response->poll_id = $this->poll->id;
+            $response->profile_id = $this->user->id;
+            $response->selection = $this->selection;
+            $response->created = common_sql_now();
+            $response->insert();
+
+        } catch (ClientException $ce) {
+            $this->error = $ce->getMessage();
+            $this->showPage();
+            return;
+        }
+
+        common_redirect($this->poll->bestUrl(), 303);
+    }
+
+    /**
+     * Show the Poll form
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if (!empty($this->error)) {
+            $this->element('p', 'error', $this->error);
+        }
+
+        $form = new PollResponseForm($this->poll, $this);
+
+        $form->show();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/plugins/Poll/showpoll.php b/plugins/Poll/showpoll.php
new file mode 100644
index 0000000000..f5002701a2
--- /dev/null
+++ b/plugins/Poll/showpoll.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Show a single Poll
+ *
+ * PHP version 5
+ *
+ * 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/>.
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Show a single Poll, with associated information
+ *
+ * @category  PollPlugin
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class ShowPollAction extends ShownoticeAction
+{
+    protected $poll = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        OwnerDesignAction::prepare($argarray);
+
+        $this->id = $this->trimmed('id');
+
+        $this->poll = Poll::staticGet('id', $this->id);
+
+        if (empty($this->poll)) {
+            throw new ClientException(_m('No such poll.'), 404);
+        }
+
+        $this->notice = $this->poll->getNotice();
+
+        if (empty($this->notice)) {
+            // Did we used to have it, and it got deleted?
+            throw new ClientException(_m('No such poll notice.'), 404);
+        }
+
+        $this->user = User::staticGet('id', $this->poll->profile_id);
+
+        if (empty($this->user)) {
+            throw new ClientException(_m('No such user.'), 404);
+        }
+
+        $this->profile = $this->user->getProfile();
+
+        if (empty($this->profile)) {
+            throw new ServerException(_m('User without a profile.'));
+        }
+
+        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        return true;
+    }
+
+    /**
+     * Title of the page
+     *
+     * Used by Action class for layout.
+     *
+     * @return string page tile
+     */
+
+    function title()
+    {
+        return sprintf(_('%s\'s poll: %s'),
+                       $this->user->nickname,
+                       $this->poll->question);
+    }
+
+}

From 5b0ca315b4c232b63b0b453ff4c7fc732f3670ff Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 10:58:14 -0800
Subject: [PATCH 16/17] 'note' -> 'notice' in an error message -- thx to AVRS
 on IRC for the catch on translatewiki.net :D

---
 actions/atompubfavoritefeed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/atompubfavoritefeed.php b/actions/atompubfavoritefeed.php
index c31fcbd72a..634bb22457 100644
--- a/actions/atompubfavoritefeed.php
+++ b/actions/atompubfavoritefeed.php
@@ -256,7 +256,7 @@ class AtompubfavoritefeedAction extends ApiAuthAction
             if (empty($notice)) {
                 // XXX: import from listed URL or something
                 // TRANS: Client exception thrown when trying favorite a notice without content.
-                throw new ClientException(_('Unknown note.'));
+                throw new ClientException(_('Unknown notice.'));
             }
 
             $old = Fave::pkeyGet(array('user_id' => $this->auth_user->id,

From ba1ada28809fdef593c8849dad0e3e01a261bbaf Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Tue, 8 Mar 2011 12:01:12 -0800
Subject: [PATCH 17/17] de-IDifying labels in notice form to fix issue with geo
 pin activating the wrong place when cloning the form

Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
---
 lib/noticeform.php                   | 16 +++++++++-------
 plugins/MobileProfile/mp-screen.css  |  2 +-
 plugins/Realtime/realtimeupdate.css  |  6 +++---
 theme/base/css/display.css           |  8 ++++----
 theme/biz/css/base.css               |  8 ++++----
 theme/biz/css/display.css            |  6 +++---
 theme/clean/css/display.css          |  4 ++--
 theme/clean/css/ie.css               |  2 +-
 theme/clean/css/mp-screen.css        |  2 +-
 theme/cleaner/css/display.css        |  6 +++---
 theme/cleaner/css/ie.css             |  2 +-
 theme/cleaner/css/mp-screen.css      |  2 +-
 theme/cloudy/css/display.css         | 14 +++++++-------
 theme/cloudy/css/ie.css              |  2 +-
 theme/default/css/display.css        |  6 +++---
 theme/default/css/ie.css             |  2 +-
 theme/identica/css/display.css       |  6 +++---
 theme/identica/css/ie.css            |  2 +-
 theme/mnml/css/display.css           | 12 ++++++------
 theme/mnml/css/ie.css                |  2 +-
 theme/mnml/css/mp-screen.css         |  2 +-
 theme/neo/css/display.css            | 21 ++++++++++-----------
 theme/neo/css/ie.css                 |  6 +++---
 theme/neo/css/mp-screen.css          |  2 +-
 theme/pigeonthoughts/css/base.css    | 15 ++++++++++-----
 theme/pigeonthoughts/css/display.css |  6 +++---
 theme/rebase/css/display.css         | 27 +++++++++++++++++----------
 theme/rebase/css/ie.css              |  2 +-
 theme/shiny/css/display.css          |  4 ++--
 theme/shiny/css/ie.css               |  2 +-
 theme/shiny/css/mp-screen.css        |  2 +-
 theme/victorian/css/display.css      |  6 +++---
 theme/victorian/css/ie.css           |  2 +-
 theme/victorian/css/mp-screen.css    |  2 +-
 34 files changed, 111 insertions(+), 98 deletions(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index ace8e5582b..271a37449c 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -187,12 +187,14 @@ class NoticeForm extends Form
             if (common_config('attachments', 'uploads')) {
                 $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
                 // TRANS: Input label in notice form for adding an attachment.
-                $this->out->element('label', array('for' => 'notice_data-attach'),_('Attach'));
-                $this->out->element('input', array('id' => 'notice_data-attach',
+                $this->out->elementStart('label', array('class' => 'notice_data-attach'));
+                $this->out->text(_('Attach'));
+                $this->out->element('input', array('class' => 'notice_data-attach',
                                                    'type' => 'file',
                                                    'name' => 'attach',
                                                    // TRANS: Title for input field to attach a file to a notice.
                                                    'title' => _('Attach a file.')));
+                $this->out->elementEnd('label');
             }
             if ($this->action) {
                 $this->out->hidden('notice_return-to', $this->action, 'returnto');
@@ -210,6 +212,7 @@ class NoticeForm extends Form
 
                 // @fixme checkbox method allows no way to change the id without changing the name
                 //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
+                $this->out->elementStart('label', 'notice_data-geo');
                 $this->out->element('input', array(
                     'name' => 'notice_data-geo',
                     'type' => 'checkbox',
@@ -218,11 +221,10 @@ class NoticeForm extends Form
                     'checked' => true, // ?
                 ));
                 $this->out->text(' ');
-                $this->out->element('label', array('class' => 'notice_data-geo',
-                                              'for' => $this->id() . '-notice_data-geo'),
-                               // TRANS: Field label to add location to a notice.
-                               _('Share my location'));
-
+                // TRANS: Field label to add location to a notice.
+                $this->out->text(_('Share my location'));
+                $this->out->elementEnd('label');
+                               
                 $this->out->elementEnd('div');
                 // TRANS: Text to not share location for a notice in notice form.
                 $share_disable_text = _('Do not share my location');
diff --git a/plugins/MobileProfile/mp-screen.css b/plugins/MobileProfile/mp-screen.css
index fcd88277e5..d82486182a 100644
--- a/plugins/MobileProfile/mp-screen.css
+++ b/plugins/MobileProfile/mp-screen.css
@@ -108,7 +108,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/plugins/Realtime/realtimeupdate.css b/plugins/Realtime/realtimeupdate.css
index 7fd7fd5ed3..3295fe4a31 100644
--- a/plugins/Realtime/realtimeupdate.css
+++ b/plugins/Realtime/realtimeupdate.css
@@ -17,13 +17,13 @@ max-width:451px;
 display:none;
 }
 
-.realtime-popup #form_notice label[for=notice_data-attach],
-.realtime-popup #form_notice #notice_data-attach,
+.realtime-popup #form_notice label.notice_data-attach,
+.realtime-popup #form_notice input.notice_data-attach,
 .realtime-popup #form_notice label.notice_data-geo {
 top:0;
 }
 
-.realtime-popup #form_notice #notice_data-attach {
+.realtime-popup #form_notice input.notice_data-attach {
 left:auto;
 right:0;
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 16c2b6dce6..85ec1286b9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -597,19 +597,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 53aca59009..3a20871de9 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -462,11 +462,11 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:49px;
@@ -474,7 +474,7 @@ width:16px;
 height:16px;
 cursor:pointer;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 text-indent:-279px;
 }
 #form_notice #notice_submit label {
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 0bb53f74a8..2e96d99d1a 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -172,14 +172,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 96a5c02a56..ea2d62020e 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -114,8 +114,8 @@ address {
     height: 54px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
 }
 
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index 994c1297d3..272a5bbcae 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index 35d8326a41..8d9489b0b1 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -94,7 +94,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cleaner/css/display.css b/theme/cleaner/css/display.css
index 214c821e59..98d4560d2a 100644
--- a/theme/cleaner/css/display.css
+++ b/theme/cleaner/css/display.css
@@ -161,8 +161,8 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -594,7 +594,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
diff --git a/theme/cleaner/css/ie.css b/theme/cleaner/css/ie.css
index dbc72b1c22..7bd48790bf 100644
--- a/theme/cleaner/css/ie.css
+++ b/theme/cleaner/css/ie.css
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/cleaner/css/mp-screen.css b/theme/cleaner/css/mp-screen.css
index 8b55e596fe..cb3c6d06b6 100644
--- a/theme/cleaner/css/mp-screen.css
+++ b/theme/cleaner/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index a5eabac4ad..5bc8ab0c1e 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -493,19 +493,19 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:25px;
 right:10.5%;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 padding:0;
 height:16px;
 }
@@ -1602,7 +1602,7 @@ background:none;
 }
 
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1787,10 +1787,10 @@ color:#000000;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
diff --git a/theme/cloudy/css/ie.css b/theme/cloudy/css/ie.css
index edddc16d88..013bdf9d16 100644
--- a/theme/cloudy/css/ie.css
+++ b/theme/cloudy/css/ie.css
@@ -34,7 +34,7 @@ height:16px;
 width:16px;
 display:block;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 filter: alpha(opacity = 0);
 left:33.5%;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index fbd3afb12c..3e3bfdfa86 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -152,14 +152,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index 2bbeb7ffa4..3100821688 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -16,7 +16,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index fba72a09d6..fe7ffa9f7d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -153,14 +153,14 @@ color:#333333;
 .entity_actions .dialogbox input {
 color:#000000;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 888c486f40..858cf3e181 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -16,7 +16,7 @@ background-color:#D9DADB;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/mnml/css/display.css b/theme/mnml/css/display.css
index 57ad426c55..e7bce84439 100644
--- a/theme/mnml/css/display.css
+++ b/theme/mnml/css/display.css
@@ -234,7 +234,7 @@ p.instructions {
 
 /*-- FORMS --*/
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -292,7 +292,7 @@ button.minimize,
 .form_notice label.notice_data-geo.checked {
     background-position:0 -1846px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 button.close {
@@ -937,19 +937,19 @@ z-index:2;
 .form_notice label {
 float:left;
 }
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
 position:absolute;
 top:2em;
 right: 3em;
 cursor:pointer;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
 text-indent:-9999px;
 width:16px;
 height:16px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 opacity: 0;
 padding:0;
 height:1.6em;
diff --git a/theme/mnml/css/ie.css b/theme/mnml/css/ie.css
index fed65f8b9a..839855aa6f 100644
--- a/theme/mnml/css/ie.css
+++ b/theme/mnml/css/ie.css
@@ -45,7 +45,7 @@ padding:0 4px;
     background:transparent url(../images/icons/icons-01.png) no-repeat 0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 .form_notice .notice_data-geo_wrap label {
diff --git a/theme/mnml/css/mp-screen.css b/theme/mnml/css/mp-screen.css
index fdee4cdef3..47fdbf5e3b 100644
--- a/theme/mnml/css/mp-screen.css
+++ b/theme/mnml/css/mp-screen.css
@@ -114,7 +114,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/neo/css/display.css b/theme/neo/css/display.css
index a542ed7609..3d98b09f02 100644
--- a/theme/neo/css/display.css
+++ b/theme/neo/css/display.css
@@ -160,8 +160,7 @@ address {
     border-radius: 6px;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach {
     top: 27px;
     right: 86px;
 }
@@ -434,8 +433,8 @@ td.entity_profile { /* cf directory table */
 
 #entity_remote_subscribe .dialogbox {
     border: 1px solid #7B4E82;
-    border-radius: 8px;
-	-moz-border-radius: 8px;
+    border-radius: 8px;
+	-moz-border-radius: 8px;
 	-webkit-border-radius: 8px;
 }
 
@@ -612,7 +611,7 @@ padding-right:0;
     right: 6px !important;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .realtime-popup .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach, .realtime-popup .form_notice input.notice_data-attach {
     right: 74px;
     top: 3px !important;
 }
@@ -637,8 +636,8 @@ padding-right:0;
 }
 
 .bookmark-notice-count {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     font-size: 1.2em;
@@ -676,8 +675,8 @@ padding-right:0;
 }
 
 ul.bookmark-tags a {
-    border-radius: 4px;
-	-moz-border-radius: 4px;
+    border-radius: 4px;
+	-moz-border-radius: 4px;
 	-webkit-border-radius: 4px;
     padding: 1px 6px;
     background: #f2f2f2;
@@ -761,8 +760,8 @@ ul.bookmark-tags a:hover {
 /* Onboard specific styles */
 
 .onboard-flash {
-    border-radius: 6px;
- 	-moz-border-radius: 6px;
+    border-radius: 6px;
+ 	-moz-border-radius: 6px;
    	-webkit-border-radius: 6px;
     font-size: 1.1em;
     box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.5);
diff --git a/theme/neo/css/ie.css b/theme/neo/css/ie.css
index 41f7dc9f88..81d13f443e 100644
--- a/theme/neo/css/ie.css
+++ b/theme/neo/css/ie.css
@@ -22,11 +22,11 @@ display:block;
     width: 106px;
     max-width: 106px;
 }
-.form_notice #notice_data-attach_selected,
+.form_notice input.notice_data-attach_selected,
 .form_notice #notice_data-geo_selected {
 width:78.75%;
 }
-.form_notice #notice_data-attach_selected button,
+.form_notice input.notice_data-attach_selected button,
 .form_notice #notice_data-geo_selected button {
 padding:0 4px;
 }
@@ -65,7 +65,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/neo/css/mp-screen.css b/theme/neo/css/mp-screen.css
index d3f95db9b6..1b7480ecaf 100644
--- a/theme/neo/css/mp-screen.css
+++ b/theme/neo/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 59cba446ac..2eade7a451 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -450,19 +450,24 @@ float:left;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice label[for=notice_data-attach],
-#form_notice #notice_data-attach {
+#form_notice label.notice_data-attach,
+#form_notice input.notice_data-attach {
 position:absolute;
-top:25px;
 cursor:pointer;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
+top:25px;
+}
+#form_notice input.notice_data-attach {
+top:0;
+}
+#form_notice label.notice_data-attach {
 text-indent:-9999px;
 left:394px;
 width:16px;
 height:16px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 left:183px;
 padding:0;
 height:16px;
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index b4f2f297b0..3ac0f0bce7 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -192,14 +192,14 @@ color:#333333;
 #form_notice.warning .count {
 color:#000000;
 }
-#form_notice label[for=notice_data-attach] {
+#form_notice label.notice_data-attach {
 background-position:0 -328px;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index f569131213..810dd70bc1 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -226,21 +226,28 @@ address .poweredby {
     color: #333 !important;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     position:absolute;
-    top: 31px;
-    right: 88px;
     cursor:pointer;
 }
+.form_notice label.notice_data-attach {
+    top: 31px;
+    right: 88px;
+}
+.form_notice input.notice_data-attach {
+    /* Positioned inside the label */
+    top: 0;
+    right: 0;
+}
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     text-indent:-9999px;
     width:16px;
     height:16px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     padding:0;
     height:16px;
 }
@@ -348,7 +355,7 @@ address .poweredby {
     opacity: 1;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
@@ -1724,7 +1731,7 @@ body.realtime-popup {
     width: 86px;
 }
 
-.realtime-popup .form_notice label[for=notice_data-attach], .form_notice #notice_data-attach {
+.realtime-popup .form_notice label.notice_data-attach {
     right: 70px;
 }
 
@@ -1734,7 +1741,7 @@ body.realtime-popup {
 
 /* icons */
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
@@ -1921,7 +1928,7 @@ background-position:0 -1648px;
 #new_group a {
 background-position:0 -1054px;
 }
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position: 0 -328px;
 }
 .form_notice label.notice_data-geo {
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 20e038998b..9dfb176698 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -61,7 +61,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index e027153dd7..32a0a7e255 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -230,8 +230,8 @@ h6 {font-size: 1em;}
     border: 1px solid #9495b7;
 }
 
-.form_notice label[for=notice_data-attach],
-.form_notice #notice_data-attach {
+.form_notice label.notice_data-attach,
+.form_notice input.notice_data-attach {
     top: 27px;
     right: 86px;
 }
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index 8145073db5..e916b1e4cc 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -63,7 +63,7 @@ line-height:auto;
     color:#FFFFFF;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     filter: alpha(opacity=0);
 }
 
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index cb899b3557..c23a24b3c9 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -99,7 +99,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 .form_notice label[for="notice_data-attach"] {
 display:none;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;
diff --git a/theme/victorian/css/display.css b/theme/victorian/css/display.css
index 6252fdf908..65d73e96fc 100644
--- a/theme/victorian/css/display.css
+++ b/theme/victorian/css/display.css
@@ -328,15 +328,15 @@ a,
     color:#000000;
 }
 
-.form_notice label[for=notice_data-attach] {
+.form_notice label.notice_data-attach {
     background-position:0 -328px;
 }
 
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
     opacity:0;
 }
 
-.form_notice label[for=notice_data-attach],
+.form_notice label.notice_data-attach,
 #export_data li a.rss,
 #export_data li a.atom,
 #export_data li a.foaf,
diff --git a/theme/victorian/css/ie.css b/theme/victorian/css/ie.css
index 038195faaf..2befa9cc48 100644
--- a/theme/victorian/css/ie.css
+++ b/theme/victorian/css/ie.css
@@ -9,7 +9,7 @@ background-color:#C8D1D5;
 .form_notice .count + label {
 background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
 }
-.form_notice #notice_data-attach {
+.form_notice input.notice_data-attach {
 filter: alpha(opacity=0);
 }
 .notice-options form.form_favor input.submit {
diff --git a/theme/victorian/css/mp-screen.css b/theme/victorian/css/mp-screen.css
index 94a534912f..584bfc7c10 100644
--- a/theme/victorian/css/mp-screen.css
+++ b/theme/victorian/css/mp-screen.css
@@ -109,7 +109,7 @@ iPhone/iPod Touch, Android, Opera Mini Simulator
 #form_notice label[for="notice_data-attach"] {
 display:none;
 }
-#form_notice #notice_data-attach {
+#form_notice input.notice_data-attach {
 position:static;
 clear:both;
 width:65%;