From fd530a892fd969f8938d8f7300d348846e684d2f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Wed, 4 Aug 2010 12:30:43 -0700
Subject: Fix for source attribution on notices; it was displaying the code
 instead of the source name sometimes.

---
 lib/noticelist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 17adf3a49..252e1ca90 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -499,7 +499,7 @@ class NoticeListItem extends Widget
         $ns = $this->notice->getSource();
 
         if ($ns) {
-            $source_name = _($ns->code);
+            $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
             $this->out->text(' ');
             $this->out->elementStart('span', 'source');
             $this->out->text(_('from'));
-- 
cgit v1.2.3


From 300ed65d301d21c33a5f0a196d6acfe762a34f29 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Thu, 5 Aug 2010 13:37:47 -0700
Subject: SubMirror plugin initial checkin: allows setting up automatic
 mirroring of posts from any of your subscriptions into your own stream,
 either via repeat or by copying the text.

The UI for setup and editing is a bit nasty for now. Can be reached via 'Mirroring' tab in account settings, or from a link at top of subscriptions list.

Currently relies on the OStatus plugin to handle actual setup, parsing, and importing of feeds; to support more general feed formatting we may need some further work there to accept weird feeds.
Also requires an actual live subscription, but this could be changed in future. (Ensuring that PSHB feed subscriptions remain live even if nobody's directly subscribed might be tricky.)

The repeat style is our preferred method since it retains full attribution, but right now we don't handle repeats very well across site boundaries; when pushed out to Twitter or to other StatusNet instances via OStatus, currently we end up losing some of the data and can end up with the 'RT @blah' version.

WARNING: There's no loop detection yet; it's most likely possible to set up a fun loop of profiles repeating each others' stuff forever and ever and ever and ever...
---
 plugins/SubMirror/SubMirrorPlugin.php        | 149 +++++++++++++++++++
 plugins/SubMirror/actions/addmirror.php      | 155 +++++++++++++++++++
 plugins/SubMirror/actions/editmirror.php     | 105 +++++++++++++
 plugins/SubMirror/actions/mirrorsettings.php | 105 +++++++++++++
 plugins/SubMirror/classes/SubMirror.php      | 213 +++++++++++++++++++++++++++
 plugins/SubMirror/lib/addmirrorform.php      | 171 +++++++++++++++++++++
 plugins/SubMirror/lib/editmirrorform.php     | 189 ++++++++++++++++++++++++
 plugins/SubMirror/lib/mirrorqueuehandler.php |  44 ++++++
 8 files changed, 1131 insertions(+)
 create mode 100644 plugins/SubMirror/SubMirrorPlugin.php
 create mode 100644 plugins/SubMirror/actions/addmirror.php
 create mode 100644 plugins/SubMirror/actions/editmirror.php
 create mode 100644 plugins/SubMirror/actions/mirrorsettings.php
 create mode 100644 plugins/SubMirror/classes/SubMirror.php
 create mode 100644 plugins/SubMirror/lib/addmirrorform.php
 create mode 100644 plugins/SubMirror/lib/editmirrorform.php
 create mode 100644 plugins/SubMirror/lib/mirrorqueuehandler.php

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
new file mode 100644
index 000000000..8678cc3dd
--- /dev/null
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -0,0 +1,149 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009-2010, 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/>.
+ */
+
+/**
+ * @package SubMirrorPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+
+
+class SubMirrorPlugin extends Plugin
+{
+    /**
+     * Hook for RouterInitialized event.
+     *
+     * @param Net_URL_Mapper $m path-to-action mapper
+     * @return boolean hook return
+     */
+    function onRouterInitialized($m)
+    {
+        $m->connect('settings/mirror',
+                    array('action' => 'mirrorsettings'));
+        $m->connect('settings/mirror/add',
+                    array('action' => 'addmirror'));
+        $m->connect('settings/mirror/edit',
+                    array('action' => 'editmirror'));
+        return true;
+    }
+
+    /**
+     * Automatically load the actions and libraries used by the plugin
+     *
+     * @param Class $cls the class
+     *
+     * @return boolean hook return
+     *
+     */
+    function onAutoload($cls)
+    {
+        $base = dirname(__FILE__);
+        $lower = strtolower($cls);
+        $files = array("$base/lib/$lower.php",
+                       "$base/classes/$cls.php");
+        if (substr($lower, -6) == 'action') {
+            $files[] = "$base/actions/" . substr($lower, 0, -6) . ".php";
+        }
+        foreach ($files as $file) {
+            if (file_exists($file)) {
+                include_once $file;
+                return false;
+            }
+        }
+        return true;
+    }
+
+    function handle($notice)
+    {
+        // Is anybody mirroring?
+        $mirror = new SubMirror();
+        $mirror->subscribed = $notice->profile_id;
+        if ($mirror->find()) {
+            while ($mirror->fetch()) {
+                $mirror->repeat($notice);
+            }
+        }
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'SubMirror',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:SubMirror',
+                            'rawdescription' =>
+                            _m('Pull feeds into your timeline!'));
+
+        return true;
+    }
+
+    /**
+     * Menu item for settings
+     *
+     * @param Action &$action Action being executed
+     *
+     * @return boolean hook return
+     */
+
+    function onEndAccountSettingsNav(&$action)
+    {
+        $action_name = $action->trimmed('action');
+
+        $action->menuItem(common_local_url('mirrorsettings'),
+                          // TRANS: SubMirror plugin menu item on user settings page.
+                          _m('MENU', 'Mirroring'),
+                          // TRANS: SubMirror plugin tooltip for user settings menu item.
+                          _m('Configure mirroring of posts from other feeds'),
+                          $action_name === 'mirrorsettings');
+
+        return true;
+    }
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+        $schema->ensureTable('submirror', SubMirror::schemaDef());
+        return true;
+    }
+
+    /**
+     * Set up queue handlers for outgoing hub pushes
+     * @param QueueManager $qm
+     * @return boolean hook return
+     */
+    function onEndInitializeQueueManager(QueueManager $qm)
+    {
+        // After each notice save, check if there's any repeat mirrors.
+        $qm->connect('mirror', 'MirrorQueueHandler');
+        return true;
+    }
+
+    function onStartEnqueueNotice($notice, &$transports)
+    {
+        $transports[] = 'mirror';
+    }
+
+    function onStartShowSubscriptionsContent($action)
+    {
+        $action->element('a',
+                         array('href' => common_local_url('mirrorsettings')),
+                         _m('Set up mirroring options...'));
+    }
+}
diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php
new file mode 100644
index 000000000..df6939491
--- /dev/null
+++ b/plugins/SubMirror/actions/addmirror.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Takes parameters:
+ *
+ *    - feed: a profile ID
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+class AddMirrorAction extends Action
+{
+    var $user;
+    var $feedurl;
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $ok = $this->sharedBoilerplate();
+        if ($ok) {
+            // and now do something useful!
+            $this->profile = $this->validateProfile($this->trimmed('profile'));
+            return true;
+        } else {
+            return $ok;
+        }
+    }
+
+    function validateProfile($id)
+    {
+        $id = intval($id);
+        $profile = Profile::staticGet('id', $id);
+        if ($profile && $profile->id != $this->user->id) {
+            return $profile;
+        }
+        // TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+        $this->clientError(_m("Invalid profile for mirroring."));
+    }
+
+    /**
+     * @fixme none of this belongs in end classes
+     * this stuff belongs in shared code!
+     */
+    function sharedBoilerplate()
+    {
+        // Only allow POST requests
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This action only accepts POST requests.'));
+            return false;
+        }
+
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token.'.
+                                 ' Try again, please.'));
+            return false;
+        }
+
+        // Only for logged-in users
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        // Throws exception on error
+        $this->saveMirror();
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new EditMirrorForm($this, $this->profile);
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('mirrorsettings');
+            common_redirect($url, 303);
+        }
+    }
+
+    function saveMirror()
+    {
+        SubMirror::saveMirror($this->user, $this->profile);
+    }
+}
diff --git a/plugins/SubMirror/actions/editmirror.php b/plugins/SubMirror/actions/editmirror.php
new file mode 100644
index 000000000..7ddd32ef3
--- /dev/null
+++ b/plugins/SubMirror/actions/editmirror.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Takes parameters:
+ *
+ *    - feed: a profile ID
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+class EditMirrorAction extends AddMirrorAction
+{
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->mirror = SubMirror::pkeyGet(array('subscriber' => $this->user->id,
+                                                 'subscribed' => $this->profile->id));
+
+        if (!$this->mirror) {
+            $this->clientError(_m("Requested invalid profile to edit."));
+        }
+
+        $this->style = $this->validateStyle($this->trimmed('style'));
+
+        // DO NOT change to $this->boolean(), it will be wrong.
+        // We're checking for the presence of the setting, not its value.
+        $this->delete = (bool)$this->arg('delete');
+
+        return true;
+    }
+
+    protected function validateStyle($style)
+    {
+        $allowed = array('repeat', 'copy');
+        if (in_array($style, $allowed)) {
+            return $style;
+        } else {
+            $this->clientError(_m("Bad form data."));
+        }
+    }
+
+    function saveMirror()
+    {
+        $mirror = SubMirror::getMirror($this->user, $this->profile);
+        if (!$mirror) {
+            $this->clientError(_m('Requested edit of missing mirror'));
+        }
+
+        if ($this->delete) {
+            $mirror->delete();
+        } else if ($this->style != $mirror->style) {
+            $orig = clone($mirror);
+            $mirror->style = $this->style;
+            $mirror->modified = common_sql_now();
+            $mirror->update($orig);
+        }
+    }
+}
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
new file mode 100644
index 000000000..edb024183
--- /dev/null
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * 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  Plugins
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 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);
+}
+
+class MirrorSettingsAction extends AccountSettingsAction
+{
+    /**
+     * Title of the page
+     *
+     * @return string Page title
+     */
+
+    function title()
+    {
+        return _m('Feed mirror settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return string Instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _m('You can mirror updates from your RSS and Atom feeds ' .
+                  'into your StatusNet timeline!');
+    }
+
+    /**
+     * Show the form for OpenID management
+     *
+     * We have one form with a few different submit buttons to do different things.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $user = common_current_user();
+        
+        $mirror = new SubMirror();
+        $mirror->subscriber = $user->id;
+        if ($mirror->find()) {
+            while ($mirror->fetch()) {
+                $this->showFeedForm($mirror);
+            }
+        }
+        $this->showAddFeedForm();
+    }
+
+    function showFeedForm($mirror)
+    {
+        $profile = Profile::staticGet('id', $mirror->subscribed);
+        if ($profile) {
+            $form = new EditMirrorForm($this, $profile);
+            $form->show();
+        }
+    }
+
+    function showAddFeedForm()
+    {
+        $form = new AddMirrorForm($this);
+        $form->show();
+    }
+
+    /**
+     * Handle a POST request
+     *
+     * Muxes to different sub-functions based on which button was pushed
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+    }
+}
diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php
new file mode 100644
index 000000000..4e7e005db
--- /dev/null
+++ b/plugins/SubMirror/classes/SubMirror.php
@@ -0,0 +1,213 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, 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/>.
+ */
+
+/**
+ * @package SubMirrorPlugin
+ * @maintainer Brion Vibber <brion@status.net>
+ */
+
+class SubMirror extends Memcached_DataObject
+{
+    public $__table = 'submirror';
+
+    public $subscriber;
+    public $subscribed;
+
+    public $style;
+
+    public $created;
+    public $modified;
+
+    public /*static*/ function staticGet($k, $v=null)
+    {
+        return parent::staticGet(__CLASS__, $k, $v);
+    }
+
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+
+    function table()
+    {
+        return array('subscriber' =>  DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'subscribed' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+
+                     'style' => DB_DATAOBJECT_STR,
+
+                     'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
+                     'modified' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
+    }
+
+    static function schemaDef()
+    {
+        // @fixme need a reverse key on (subscribed, subscriber) as well
+        return array(new ColumnDef('subscriber', 'integer',
+                                   null, false, 'PRI'),
+                     new ColumnDef('subscribed', 'integer',
+                                   null, false, 'PRI'),
+
+                     new ColumnDef('style', 'varchar',
+                                   16, true),
+
+                     new ColumnDef('created', 'datetime',
+                                   null, false),
+                     new ColumnDef('modified', 'datetime',
+                                   null, false));
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * DB_DataObject needs to know about keys that the table has; this function
+     * defines them.
+     *
+     * @return array key definitions
+     */
+
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * return key definitions for Memcached_DataObject
+     *
+     * Our caching system uses the same key definitions, but uses a different
+     * method to get them.
+     *
+     * @return array key definitions
+     */
+
+    function keyTypes()
+    {
+        // @fixme keys
+        // need a sane key for reverse lookup too
+        return array('subscriber' => 'K', 'subscribed' => 'K');
+    }
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    /**
+     * @param Profile $subscribed
+     * @param Profile $subscribed
+     * @return SubMirror
+     * @throws ServerException
+     */
+    public static function saveMirror($subscriber, $subscribed, $style='repeat')
+    {
+        // @fixme make sure they're subscribed!
+        $mirror = new SubMirror();
+
+        $mirror->subscriber = $subscriber->id;
+        $mirror->subscribed = $subscribed->id;
+        $mirror->style = $style;
+
+        $mirror->created = common_sql_now();
+        $mirror->modified = common_sql_now();
+        $mirror->insert();
+        
+        return $mirror;
+    }
+
+    /**
+     * @param Notice $notice
+     * @return mixed Notice on successful mirroring, boolean if not
+     */
+    public function mirrorNotice($notice)
+    {
+        $profile = Profile::staticGet('id', $this->subscriber);
+        if (!$profile) {
+            common_log(LOG_ERROR, "SubMirror plugin skipping auto-repeat of notice $notice->id for missing user $profile->id");
+            return false;
+        }
+
+        if ($this->style == 'copy') {
+            return $this->copyNotice($profile, $notice);
+        } else { // default to repeat mode
+            return $this->repeatNotice($profile, $notice);
+        }
+    }
+
+    /**
+     * Mirror a notice using StatusNet's repeat functionality.
+     * This retains attribution within the site, and other nice things,
+     * but currently ends up looking like 'RT @foobar bla bla' when
+     * bridged out over OStatus or TwitterBridge.
+     * 
+     * @param Notice $notice
+     * @return mixed Notice on successful repeat, true if already repeated, false on failure
+     */
+    protected function repeatNotice($profile, $notice)
+    {
+        if($profile->hasRepeated($notice->id)) {
+            common_log(LOG_INFO, "SubMirror plugin skipping auto-repeat of notice $notice->id for user $profile->id; already repeated.");
+            return true;
+        } else {
+            common_log(LOG_INFO, "SubMirror plugin auto-repeating notice $notice->id for $profile->id");
+            return $notice->repeat($profile->id, 'mirror');
+        }
+    }
+
+    /**
+     * Mirror a notice by emitting a new notice with the same contents.
+     * Kind of dirty, but if pulling an external data feed into an account
+     * that may be what you want.
+     * 
+     * @param Notice $notice
+     * @return mixed Notice on successful repeat, true if already repeated, false on failure
+     */
+    protected function copyNotice($profile, $notice)
+    {
+        $options = array('is_local' => Notice::LOCAL_PUBLIC,
+                         'url' => $notice->bestUrl(), // pass through the foreign link...
+                         'rendered' => $notice->rendered);
+
+        $saved = Notice::saveNew($profile->id,
+                                 $notice->content,
+                                 'feed',
+                                 $options);
+        return $saved;
+    }
+
+    public /*static*/ function pkeyGet($v)
+    {
+        return parent::pkeyGet(__CLASS__, $v);
+    }
+
+    /**
+     * Get the mirroring setting for a pair of profiles, if existing.
+     * 
+     * @param Profile $subscriber
+     * @param Profile $subscribed
+     * @return mixed Profile or empty
+     */
+    public static function getMirror($subscriber, $subscribed)
+    {
+        return self::pkeyGet(array('subscriber' => $subscriber->id,
+                                   'subscribed' => $subscribed->id));
+    }
+}
diff --git a/plugins/SubMirror/lib/addmirrorform.php b/plugins/SubMirror/lib/addmirrorform.php
new file mode 100644
index 000000000..9ee59661a
--- /dev/null
+++ b/plugins/SubMirror/lib/addmirrorform.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ * 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/>.
+ *
+ * @package   StatusNet
+ * @copyright 2010 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);
+}
+
+class AddMirrorForm extends Form
+{
+
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset');
+
+        $this->out->elementStart('ul');
+
+        $this->li();
+        $this->out->element('label', array('for' => $this->id() . '-profile'),
+                            _m("Mirror one of your existing subscriptions:"));
+        $this->out->elementStart('select', array('name' => 'profile'));
+
+        $user = common_current_user();
+        $profile = $user->getSubscriptions();
+        while ($profile->fetch()) {
+            $mirror = SubMirror::pkeyGet(array('subscriber' => $user->id,
+                                               'subscribed' => $profile->id));
+            if (!$mirror) {
+                $this->out->element('option',
+                                    array('value' => $profile->id),
+                                    $profile->getBestName());
+            }
+        }
+        $this->out->elementEnd('select');
+        $this->out->submit($this->id() . '-save', _m('Save'));
+        $this->unli();
+
+
+        $this->li();
+
+        $this->out->elementStart('fieldset', array('style' => 'width: 360px; margin-left: auto; margin-right: auto'));
+        $this->out->element('p', false,
+                            _m("Not already subscribed to the feed you want? " .
+                               "Add a new remote subscription and paste in the URL!"));
+
+        $this->out->elementStart('div', 'entity_actions');
+        $this->out->elementStart('p', array('id' => 'entity_remote_subscribe',
+                                         'class' => 'entity_subscribe'));
+        $this->out->element('a', array('href' => common_local_url('ostatussub'),
+                                    'class' => 'entity_remote_subscribe')
+                            , _m('Remote'));
+        $this->out->elementEnd('p');
+        $this->out->elementEnd('div');
+
+        $this->out->element('div', array('style' => 'clear: both'));
+        $this->out->elementEnd('fieldset');
+        $this->unli();
+        
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('fieldset');
+    }
+
+    private function doInput($id, $name, $label, $value=null, $instructions=null)
+    {
+        $this->out->element('label', array('for' => $id), $label);
+        $attrs = array('name' => $name,
+                       'type' => 'text',
+                       'id' => $id);
+        if ($value) {
+            $attrs['value'] = $value;
+        }
+        $this->out->element('input', $attrs);
+        if ($instructions) {
+            $this->out->element('p', 'form_guide', $instructions);
+        }
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return string ID of the form
+     */
+
+    function id()
+    {
+        return 'add-mirror-form';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('addmirror');
+    }
+
+    /**
+     * Class of the form.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+}
diff --git a/plugins/SubMirror/lib/editmirrorform.php b/plugins/SubMirror/lib/editmirrorform.php
new file mode 100644
index 000000000..8236da389
--- /dev/null
+++ b/plugins/SubMirror/lib/editmirrorform.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ * 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/>.
+ *
+ * @package   StatusNet
+ * @copyright 2010 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);
+}
+
+class EditMirrorForm extends Form
+{
+    function __construct($action, $profile)
+    {
+        parent::__construct($action);
+
+        $this->profile = clone($profile);
+        $this->user = common_current_user();
+        $this->mirror = SubMirror::pkeyGet(array('subscriber' => $this->user->id,
+                                                 'subscribed' => $this->profile->id));
+    }
+
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->elementStart('fieldset');
+
+        $this->out->hidden('profile', $this->profile->id);
+
+        $this->out->elementStart('div', array('style' => 'float: left; width: 80px;'));
+        $img = $this->getAvatar($this->profile);
+        $feed = $this->getFeed($this->profile);
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl));
+        $this->out->element('img', array('src' => $img, 'style' => 'float: left'));
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('div');
+
+
+        $this->out->elementStart('div', array('style' => 'margin-left: 80px; margin-right: 20px'));
+        $this->out->elementStart('p');
+        $this->out->elementStart('div');
+        $this->out->element('a', array('href' => $this->profile->profileurl), $this->profile->getBestName());
+        $this->out->elementEnd('div');
+        $this->out->elementStart('div');
+        if ($feed) {
+            $this->out->text(_m('LABEL', 'Remote feed:') . ' ');
+            //$this->out->element('a', array('href' => $feed), $feed);
+            $this->out->element('input', array('value' => $feed, 'readonly' => 'readonly', 'style' => 'width: 100%'));
+        } else {
+            $this->out->text(_m('LABEL', 'Local user'));
+        }
+        $this->out->elementEnd('div');
+        $this->out->elementEnd('p');
+
+        $this->out->elementStart('fieldset', array('style' => 'margin-top: 20px'));
+        $this->out->element('legend', false, _m("Mirroring style"));
+
+        $styles = array('repeat' => _m("Repeat: reference the original user's post (sometimes shows as 'RT @blah')"),
+                        'copy' => _m("Repost the content under my account"));
+        foreach ($styles as $key => $label) {
+            $this->out->elementStart('div');
+            $attribs = array('type' => 'radio',
+                             'value' => $key,
+                             'name' => 'style',
+                             'id' => $this->id() . '-style');
+            if ($key == $this->mirror->style || ($key == 'repeat' && empty($this->mirror->style))) {
+                $attribs['checked'] = 'checked';
+            }
+            $this->out->element('input', $attribs);
+            $this->out->element('span', false, $label); // @fixme should be label, but the styles muck it up for now
+            $this->out->elementEnd('div');
+
+        }
+        $this->out->elementEnd('fieldset');
+
+        
+        $this->out->elementStart('div');
+        $this->out->submit($this->id() . '-save', _m('Save'));
+        $this->out->element('input', array('type' => 'submit',
+                                           'value' => _m('Stop mirroring'),
+                                           'name' => 'delete',
+                                           'class' => 'submit'));
+        $this->out->elementEnd('div');
+
+        $this->out->elementEnd('div');
+        $this->out->elementEnd('fieldset');
+    }
+
+    private function getAvatar($profile)
+    {
+        $avatar = $this->profile->getAvatar(48);
+        if ($avatar) {
+            return $avatar->displayUrl();
+        } else {
+            return Avatar::defaultImage(48);
+        }
+    }
+
+    private function getFeed($profile)
+    {
+        // Ok this is a bit of a hack. ;)
+        if (class_exists('Ostatus_profile')) {
+            $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
+            if ($oprofile) {
+                return $oprofile->feeduri;
+            }
+        }
+        var_dump('wtf');
+        return false;
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return string ID of the form
+     */
+
+    function id()
+    {
+        return 'edit-mirror-form-' . $this->profile->id;
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('editmirror');
+    }
+
+    /**
+     * Class of the form.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+
+}
diff --git a/plugins/SubMirror/lib/mirrorqueuehandler.php b/plugins/SubMirror/lib/mirrorqueuehandler.php
new file mode 100644
index 000000000..0306180ee
--- /dev/null
+++ b/plugins/SubMirror/lib/mirrorqueuehandler.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, 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/>.
+ */
+
+/**
+ * Check for subscription mirroring options on each newly seen post!
+ *
+ * @package SubMirror
+ * @author Brion Vibber <brion@status.net>
+ */
+
+class MirrorQueueHandler extends QueueHandler
+{
+    function transport()
+    {
+        return 'mirror';
+    }
+
+    function handle($notice)
+    {
+        $mirror = new SubMirror();
+        $mirror->subscribed = $notice->profile_id;
+        if ($mirror->find()) {
+            while ($mirror->fetch()) {
+                $mirror->mirrorNotice($notice);
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From ebd2fc2f7cb799cc190b2d4a77d8d0057a8854c0 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 6 Aug 2010 10:14:07 -0700
Subject: Partial fix for ticket #2489 -- problems with SNI SSL virtual host
 certificate validation.

Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.

I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
---
 lib/default.php    |  3 ++-
 lib/httpclient.php | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/default.php b/lib/default.php
index dcf225d1f..45a4560ff 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -315,6 +315,7 @@ $default =
               'members' => true,
               'peopletag' => true),
         'http' => // HTTP client settings when contacting other sites
-        array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+        array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
+              'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
               ),
         );
diff --git a/lib/httpclient.php b/lib/httpclient.php
index b69f718e5..514a5afeb 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -145,6 +145,10 @@ class HTTPClient extends HTTP_Request2
             $this->config['ssl_verify_peer'] = false;
         }
 
+        if (common_config('http', 'curl') && extension_loaded('curl')) {
+            $this->config['adapter'] = 'HTTP_Request2_Adapter_Curl';
+        }
+
         parent::__construct($url, $method, $config);
         $this->setHeader('User-Agent', $this->userAgent());
     }
@@ -204,6 +208,15 @@ class HTTPClient extends HTTP_Request2
     protected function doRequest($url, $method, $headers)
     {
         $this->setUrl($url);
+
+        // Workaround for HTTP_Request2 not setting up SNI in socket contexts;
+        // This fixes cert validation for SSL virtual hosts using SNI.
+        // Requires PHP 5.3.2 or later and OpenSSL with SNI support.
+        if ($this->url->getScheme() == 'https' && defined('OPENSSL_TLSEXT_SERVER_NAME')) {
+            $this->config['ssl_SNI_enabled'] = true;
+            $this->config['ssl_SNI_server_name'] = $this->url->getHost();
+        }
+
         $this->setMethod($method);
         if ($headers) {
             foreach ($headers as $header) {
-- 
cgit v1.2.3


From 7e55fc00447923b40b2ffc87329fd95347d776f5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 6 Aug 2010 10:56:18 -0700
Subject: OStatus/FeedSub: tweaked PuSH feed garbage collection so other
 plugins can declare usage of a low-level feed or an OStatus profile besides
 profile subscriptions & group memberships. SubMirror: redid add-mirror
 frontend to accept a feed URL, then pass that on to OStatus, instead of
 pulling from your subscriptions. Profile: tweaked subscriberCount() so it
 doesn't subtract 1 for foreign profiles who aren't subscribed to themselves;
 instead excludes the self-subscription in the count query.
 Memcached_DataObject: tweak to avoid extra error spew in the DB error raising

Work in progress: tweaking feedsub garbage collection so we can count other uses
---
 classes/Memcached_DataObject.php             |  2 +-
 classes/Profile.php                          |  4 +-
 plugins/OStatus/OStatusPlugin.php            | 18 ++++++
 plugins/OStatus/classes/FeedSub.php          | 30 +++++++++
 plugins/OStatus/classes/Ostatus_profile.php  | 45 ++++++++------
 plugins/SubMirror/SubMirrorPlugin.php        | 23 +++++++
 plugins/SubMirror/actions/addmirror.php      | 92 +++-------------------------
 plugins/SubMirror/actions/editmirror.php     |  9 ++-
 plugins/SubMirror/actions/mirrorsettings.php |  5 +-
 plugins/SubMirror/lib/addmirrorform.php      | 44 +++----------
 10 files changed, 124 insertions(+), 148 deletions(-)

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index 7768fe757..0f1ed0489 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -574,7 +574,7 @@ class Memcached_DataObject extends Safe_DataObject
     function raiseError($message, $type = null, $behaviour = null)
     {
         $id = get_class($this);
-        if ($this->id) {
+        if (!empty($this->id)) {
             $id .= ':' . $this->id;
         }
         if ($message instanceof PEAR_Error) {
diff --git a/classes/Profile.php b/classes/Profile.php
index 0d0463b73..d7617f0b7 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -464,11 +464,9 @@ class Profile extends Memcached_DataObject
 
         $sub = new Subscription();
         $sub->subscribed = $this->id;
-
+        $sub->whereAdd('subscriber != subscribed');
         $cnt = (int) $sub->count('distinct subscriber');
 
-        $cnt = ($cnt > 0) ? $cnt - 1 : $cnt;
-
         if (!empty($c)) {
             $c->set(common_cache_key('profile:subscriber_count:'.$this->id), $cnt);
         }
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 70971c5b3..3b073a5d1 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -479,6 +479,24 @@ class OStatusPlugin extends Plugin
         }
     }
 
+    /**
+     * Tell the FeedSub infrastructure whether we have any active OStatus
+     * usage for the feed; if not it'll be able to garbage-collect the
+     * feed subscription.
+     * 
+     * @param FeedSub $feedsub
+     * @param integer $count in/out
+     * @return mixed hook return code
+     */
+    function onFeedSubSubscriberCount($feedsub, &$count)
+    {
+        $oprofile = Ostatus_profile::staticGet('feeduri', $feedsub->uri);
+        if ($oprofile) {
+            $count += $oprofile->subscriberCount();
+        }
+        return true;
+    }
+
     /**
      * When about to subscribe to a remote user, start a server-to-server
      * PuSH subscription if needed. If we can't establish that, abort.
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index b10509dae..9cd35e29c 100644
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -255,6 +255,9 @@ class FeedSub extends Memcached_DataObject
     /**
      * Send a PuSH unsubscription request to the hub for this feed.
      * The hub will later send us a confirmation POST to /main/push/callback.
+     * Warning: this will cancel the subscription even if someone else in
+     * the system is using it. Most callers will want garbageCollect() instead,
+     * which confirms there's no uses left.
      *
      * @return bool true on success, false on failure
      * @throws ServerException if feed state is not valid
@@ -275,6 +278,33 @@ class FeedSub extends Memcached_DataObject
         return $this->doSubscribe('unsubscribe');
     }
 
+    /**
+     * Check if there are any active local uses of this feed, and if not then
+     * make sure it's inactive, unsubscribing if necessary.
+     *
+     * @return boolean true if the subscription is now inactive, false if still active.
+     */
+    public function garbageCollect()
+    {
+        if ($this->sub_state == '' || $this->sub_state == 'inactive') {
+            // No active PuSH subscription, we can just leave it be.
+            return true;
+        } else {
+            // PuSH subscription is either active or in an indeterminate state.
+            // Check if we're out of subscribers, and if so send an unsubscribe.
+            $count = 0;
+            Event::handle('FeedSubSubscriberCount', array($this, &$count));
+
+            if ($count) {
+                common_log(LOG_INFO, __METHOD__ . ': ok, ' . $count . ' user(s) left for ' . $this->uri);
+                return false;
+            } else {
+                common_log(LOG_INFO, __METHOD__ . ': unsubscribing, no users left for ' . $this->uri);
+                return $this->unsubscribe();
+            }
+        }
+    }
+
     protected function doSubscribe($mode)
     {
         $orig = clone($this);
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 5d3f37cd0..2d7c632e6 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -215,22 +215,13 @@ class Ostatus_profile extends Memcached_DataObject
     }
 
     /**
-     * Send a PuSH unsubscription request to the hub for this feed.
-     * The hub will later send us a confirmation POST to /main/push/callback.
+     * Check if this remote profile has any active local subscriptions, and
+     * if not drop the PuSH subscription feed.
      *
      * @return bool true on success, false on failure
-     * @throws ServerException if feed state is not valid
      */
     public function unsubscribe() {
-        $feedsub = FeedSub::staticGet('uri', $this->feeduri);
-        if (!$feedsub || $feedsub->sub_state == '' || $feedsub->sub_state == 'inactive') {
-            // No active PuSH subscription, we can just leave it be.
-            return true;
-        } else {
-            // PuSH subscription is either active or in an indeterminate state.
-            // Send an unsubscribe.
-            return $feedsub->unsubscribe();
-        }
+        $this->garbageCollect();
     }
 
     /**
@@ -240,6 +231,21 @@ class Ostatus_profile extends Memcached_DataObject
      * @return boolean
      */
     public function garbageCollect()
+    {
+        $feedsub = FeedSub::staticGet('uri', $this->feeduri);
+        return $feedsub->garbageCollect();
+    }
+
+    /**
+     * Check if this remote profile has any active local subscriptions, so the
+     * PuSH subscription layer can decide if it can drop the feed.
+     *
+     * This gets called via the FeedSubSubscriberCount event when running
+     * FeedSub::garbageCollect().
+     *
+     * @return int
+     */
+    public function subscriberCount()
     {
         if ($this->isGroup()) {
             $members = $this->localGroup()->getMembers(0, 1);
@@ -247,13 +253,14 @@ class Ostatus_profile extends Memcached_DataObject
         } else {
             $count = $this->localProfile()->subscriberCount();
         }
-        if ($count == 0) {
-            common_log(LOG_INFO, "Unsubscribing from now-unused remote feed $this->feeduri");
-            $this->unsubscribe();
-            return true;
-        } else {
-            return false;
-        }
+        common_log(LOG_INFO, __METHOD__ . " SUB COUNT BEFORE: $count");
+
+        // Other plugins may be piggybacking on OStatus without having
+        // an active group or user-to-user subscription we know about.
+        Event::handle('Ostatus_profileSubscriberCount', array($this, &$count));
+        common_log(LOG_INFO, __METHOD__ . " SUB COUNT AFTER: $count");
+
+        return $count;
     }
 
     /**
diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 8678cc3dd..00c04ad0b 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -146,4 +146,27 @@ class SubMirrorPlugin extends Plugin
                          array('href' => common_local_url('mirrorsettings')),
                          _m('Set up mirroring options...'));
     }
+
+    /**
+     * Let the OStatus subscription garbage collection know if we're
+     * making use of a remote feed, so it doesn't get dropped out
+     * from under us.
+     *
+     * @param Ostatus_profile $oprofile
+     * @param int $count in/out
+     * @return mixed hook return value
+     */
+    function onOstatus_profileSubscriberCount($oprofile, &$count)
+    {
+        if ($oprofile->profile_id) {
+            $mirror = new SubMirror();
+            $mirror->subscribed = $oprofile->profile_id;
+            if ($mirror->find()) {
+                while ($mirror->fetch()) {
+                    $count++;
+                }
+            }
+        }
+        return true;
+    }
 }
diff --git a/plugins/SubMirror/actions/addmirror.php b/plugins/SubMirror/actions/addmirror.php
index df6939491..5acdf1dfe 100644
--- a/plugins/SubMirror/actions/addmirror.php
+++ b/plugins/SubMirror/actions/addmirror.php
@@ -46,9 +46,8 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class AddMirrorAction extends Action
+class AddMirrorAction extends BaseMirrorAction
 {
-    var $user;
     var $feedurl;
 
     /**
@@ -62,94 +61,17 @@ class AddMirrorAction extends Action
     function prepare($args)
     {
         parent::prepare($args);
-        $ok = $this->sharedBoilerplate();
-        if ($ok) {
-            // and now do something useful!
-            $this->profile = $this->validateProfile($this->trimmed('profile'));
-            return true;
-        } else {
-            return $ok;
-        }
-    }
-
-    function validateProfile($id)
-    {
-        $id = intval($id);
-        $profile = Profile::staticGet('id', $id);
-        if ($profile && $profile->id != $this->user->id) {
-            return $profile;
-        }
-        // TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
-        $this->clientError(_m("Invalid profile for mirroring."));
-    }
-
-    /**
-     * @fixme none of this belongs in end classes
-     * this stuff belongs in shared code!
-     */
-    function sharedBoilerplate()
-    {
-        // Only allow POST requests
-
-        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->clientError(_('This action only accepts POST requests.'));
-            return false;
-        }
-
-        // CSRF protection
-
-        $token = $this->trimmed('token');
-
-        if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token.'.
-                                 ' Try again, please.'));
-            return false;
-        }
-
-        // Only for logged-in users
-
-        $this->user = common_current_user();
-
-        if (empty($this->user)) {
-            $this->clientError(_('Not logged in.'));
-            return false;
-        }
+        $this->feedurl = $this->validateFeedUrl($this->trimmed('feedurl'));
+        $this->profile = $this->profileForFeed($this->feedurl);
         return true;
     }
 
-    /**
-     * Handle request
-     *
-     * Does the subscription and returns results.
-     *
-     * @param Array $args unused.
-     *
-     * @return void
-     */
-
-    function handle($args)
+    function saveMirror()
     {
-        // Throws exception on error
-        $this->saveMirror();
-
-        if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8');
-            $this->elementStart('head');
-            $this->element('title', null, _('Subscribed'));
-            $this->elementEnd('head');
-            $this->elementStart('body');
-            $unsubscribe = new EditMirrorForm($this, $this->profile);
-            $unsubscribe->show();
-            $this->elementEnd('body');
-            $this->elementEnd('html');
+        if ($this->oprofile->subscribe()) {
+            SubMirror::saveMirror($this->user, $this->profile);
         } else {
-            $url = common_local_url('mirrorsettings');
-            common_redirect($url, 303);
+            $this->serverError(_m("Could not subscribe to feed."));
         }
     }
-
-    function saveMirror()
-    {
-        SubMirror::saveMirror($this->user, $this->profile);
-    }
 }
diff --git a/plugins/SubMirror/actions/editmirror.php b/plugins/SubMirror/actions/editmirror.php
index 7ddd32ef3..c7fdab0d6 100644
--- a/plugins/SubMirror/actions/editmirror.php
+++ b/plugins/SubMirror/actions/editmirror.php
@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class EditMirrorAction extends AddMirrorAction
+class EditMirrorAction extends BaseMirrorAction
 {
 
     /**
@@ -60,6 +60,9 @@ class EditMirrorAction extends AddMirrorAction
     function prepare($args)
     {
         parent::prepare($args);
+
+        $this->profile = $this->validateProfile($this->trimmed('profile'));
+
         $this->mirror = SubMirror::pkeyGet(array('subscriber' => $this->user->id,
                                                  'subscribed' => $this->profile->id));
 
@@ -95,6 +98,10 @@ class EditMirrorAction extends AddMirrorAction
 
         if ($this->delete) {
             $mirror->delete();
+            $oprofile = Ostatus_profile::staticGet('profile_id', $this->profile->id);
+            if ($oprofile) {
+                $oprofile->garbageCollect();
+            }
         } else if ($this->style != $mirror->style) {
             $orig = clone($mirror);
             $mirror->style = $this->style;
diff --git a/plugins/SubMirror/actions/mirrorsettings.php b/plugins/SubMirror/actions/mirrorsettings.php
index edb024183..5463a8dc0 100644
--- a/plugins/SubMirror/actions/mirrorsettings.php
+++ b/plugins/SubMirror/actions/mirrorsettings.php
@@ -50,7 +50,7 @@ class MirrorSettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
-        return _m('You can mirror updates from your RSS and Atom feeds ' .
+        return _m('You can mirror updates from many RSS and Atom feeds ' .
                   'into your StatusNet timeline!');
     }
 
@@ -65,6 +65,8 @@ class MirrorSettingsAction extends AccountSettingsAction
     function showContent()
     {
         $user = common_current_user();
+
+        $this->showAddFeedForm();
         
         $mirror = new SubMirror();
         $mirror->subscriber = $user->id;
@@ -73,7 +75,6 @@ class MirrorSettingsAction extends AccountSettingsAction
                 $this->showFeedForm($mirror);
             }
         }
-        $this->showAddFeedForm();
     }
 
     function showFeedForm($mirror)
diff --git a/plugins/SubMirror/lib/addmirrorform.php b/plugins/SubMirror/lib/addmirrorform.php
index 9ee59661a..0a798c9ea 100644
--- a/plugins/SubMirror/lib/addmirrorform.php
+++ b/plugins/SubMirror/lib/addmirrorform.php
@@ -57,46 +57,15 @@ class AddMirrorForm extends Form
         $this->out->elementStart('ul');
 
         $this->li();
-        $this->out->element('label', array('for' => $this->id() . '-profile'),
-                            _m("Mirror one of your existing subscriptions:"));
-        $this->out->elementStart('select', array('name' => 'profile'));
-
-        $user = common_current_user();
-        $profile = $user->getSubscriptions();
-        while ($profile->fetch()) {
-            $mirror = SubMirror::pkeyGet(array('subscriber' => $user->id,
-                                               'subscribed' => $profile->id));
-            if (!$mirror) {
-                $this->out->element('option',
-                                    array('value' => $profile->id),
-                                    $profile->getBestName());
-            }
-        }
-        $this->out->elementEnd('select');
-        $this->out->submit($this->id() . '-save', _m('Save'));
+        $this->doInput('addmirror-feedurl',
+                       'feedurl',
+                       _m('Web page or feed URL:'),
+                       $this->out->trimmed('feedurl'));
         $this->unli();
 
-
         $this->li();
-
-        $this->out->elementStart('fieldset', array('style' => 'width: 360px; margin-left: auto; margin-right: auto'));
-        $this->out->element('p', false,
-                            _m("Not already subscribed to the feed you want? " .
-                               "Add a new remote subscription and paste in the URL!"));
-
-        $this->out->elementStart('div', 'entity_actions');
-        $this->out->elementStart('p', array('id' => 'entity_remote_subscribe',
-                                         'class' => 'entity_subscribe'));
-        $this->out->element('a', array('href' => common_local_url('ostatussub'),
-                                    'class' => 'entity_remote_subscribe')
-                            , _m('Remote'));
-        $this->out->elementEnd('p');
-        $this->out->elementEnd('div');
-
-        $this->out->element('div', array('style' => 'clear: both'));
-        $this->out->elementEnd('fieldset');
+        $this->out->submit('addmirror-save', _m('Add feed'));
         $this->unli();
-        
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
     }
@@ -106,7 +75,8 @@ class AddMirrorForm extends Form
         $this->out->element('label', array('for' => $id), $label);
         $attrs = array('name' => $name,
                        'type' => 'text',
-                       'id' => $id);
+                       'id' => $id,
+                       'style' => 'width: 80%');
         if ($value) {
             $attrs['value'] = $value;
         }
-- 
cgit v1.2.3


From 79485340ab31ef9444431a098a5909b0be874264 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 6 Aug 2010 11:55:56 -0700
Subject: SubMirror: Drop mirror link from subscriptions list; has decoupled
 from subscriptions.

---
 plugins/SubMirror/SubMirrorPlugin.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 00c04ad0b..7289e7793 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -140,13 +140,6 @@ class SubMirrorPlugin extends Plugin
         $transports[] = 'mirror';
     }
 
-    function onStartShowSubscriptionsContent($action)
-    {
-        $action->element('a',
-                         array('href' => common_local_url('mirrorsettings')),
-                         _m('Set up mirroring options...'));
-    }
-
     /**
      * Let the OStatus subscription garbage collection know if we're
      * making use of a remote feed, so it doesn't get dropped out
-- 
cgit v1.2.3


From 729912e36a826f63ae109ae82125a97d1b100ce5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 6 Aug 2010 12:00:31 -0700
Subject: Missing file from SubMirror. :P

---
 plugins/SubMirror/actions/basemirror.php | 169 +++++++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 plugins/SubMirror/actions/basemirror.php

diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
new file mode 100644
index 000000000..5be0699f0
--- /dev/null
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, 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/>.
+ *
+ * PHP version 5
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Brion Vibber <brion@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Takes parameters:
+ *
+ *    - feed: a profile ID
+ *    - token: session token to prevent CSRF attacks
+ *    - ajax: boolean; whether to return Ajax or full-browser results
+ *
+ * Only works if the current user is logged in.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
+ * @link      http://status.net/
+ */
+
+abstract class BaseMirrorAction extends Action
+{
+    var $user;
+    var $profile;
+
+    /**
+     * Check pre-requisites and instantiate attributes
+     *
+     * @param Array $args array of arguments (URL, GET, POST)
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        return $this->sharedBoilerplate();
+    }
+
+    protected function validateFeedUrl($url)
+    {
+        if (common_valid_http_url($url)) {
+            return $url;
+        } else {
+            $this->clientError(_m("Invalid feed URL."));
+        }
+    }
+
+    protected function validateProfile($id)
+    {
+        $id = intval($id);
+        $profile = Profile::staticGet('id', $id);
+        if ($profile && $profile->id != $this->user->id) {
+            return $profile;
+        }
+        // TRANS: Error message returned to user when setting up feed mirroring, but we were unable to resolve the given URL to a working feed.
+        $this->clientError(_m("Invalid profile for mirroring."));
+    }
+
+    /**
+     *
+     * @param string $url
+     * @return Profile
+     */
+    protected function profileForFeed($url)
+    {
+        $oprofile = Ostatus_profile::ensureProfileURL($url);
+        if ($oprofile->isGroup()) {
+            $this->clientError(_m("Can't mirror a StatusNet group at this time."));
+        }
+        $this->oprofile = $oprofile; // @fixme ugly side effect :D
+        return $oprofile->localProfile();
+    }
+
+    /**
+     * @fixme none of this belongs in end classes
+     * this stuff belongs in shared code!
+     */
+    function sharedBoilerplate()
+    {
+        // Only allow POST requests
+
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            $this->clientError(_('This action only accepts POST requests.'));
+            return false;
+        }
+
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token.'.
+                                 ' Try again, please.'));
+            return false;
+        }
+
+        // Only for logged-in users
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            $this->clientError(_('Not logged in.'));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Does the subscription and returns results.
+     *
+     * @param Array $args unused.
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        // Throws exception on error
+        $this->saveMirror();
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $unsubscribe = new EditMirrorForm($this, $this->profile);
+            $unsubscribe->show();
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            $url = common_local_url('mirrorsettings');
+            common_redirect($url, 303);
+        }
+    }
+
+    abstract function saveMirror();
+}
-- 
cgit v1.2.3


From 39277ebf78dbe21e27bb93550689a983bd0237ae Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Fri, 6 Aug 2010 12:04:34 -0700
Subject: And.... one more fix for queueing in SubMirror.

---
 plugins/SubMirror/lib/mirrorqueuehandler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/SubMirror/lib/mirrorqueuehandler.php b/plugins/SubMirror/lib/mirrorqueuehandler.php
index 0306180ee..92b36b5eb 100644
--- a/plugins/SubMirror/lib/mirrorqueuehandler.php
+++ b/plugins/SubMirror/lib/mirrorqueuehandler.php
@@ -40,5 +40,6 @@ class MirrorQueueHandler extends QueueHandler
                 $mirror->mirrorNotice($notice);
             }
         }
+        return true;
     }
 }
-- 
cgit v1.2.3


From fd2919be18c6045f948b77d4eba1a81212548d4a Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 6 Aug 2010 22:48:00 -0500
Subject: Fixed PHP 5.3 by & value Cleaned up {}'s

---
 plugins/Gravatar/GravatarPlugin.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index 580852072..8a9721ea9 100644
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -30,11 +30,13 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class GravatarPlugin extends Plugin
 {
-    function onInitializePlugin() {
+    function onInitializePlugin()
+    {
         return true;
     }
     
-    function onStartAvatarFormData($action) {
+    function onStartAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
         
@@ -43,7 +45,8 @@ class GravatarPlugin extends Plugin
         }
     }
     
-    function onEndAvatarFormData(&$action) {
+    function onEndAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
 
@@ -89,7 +92,8 @@ class GravatarPlugin extends Plugin
         }
     }
     
-    function onStartAvatarSaveForm($action) {
+    function onStartAvatarSaveForm($action)
+    {
         if ($action->arg('add')) {
             $result = $this->gravatar_save();
 
@@ -178,7 +182,8 @@ class GravatarPlugin extends Plugin
                      'success' => true);
     }
  
-    function gravatar_url($email, $size) {
+    function gravatar_url($email, $size)
+    {
         $url = "http://www.gravatar.com/avatar.php?gravatar_id=".
                 md5(strtolower($email)).
                 "&default=".urlencode(Avatar::defaultImage($size)).
@@ -197,4 +202,4 @@ class GravatarPlugin extends Plugin
 
         return true;
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From c8a706081e45d67280dd6be2d68922236adc85f2 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Sat, 7 Aug 2010 09:48:21 -0400
Subject: strip whitespace from me:data and me:sig (per spec)

---
 plugins/OStatus/lib/magicenvelope.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index 3bdf24b31..967e5f6d1 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -210,13 +210,13 @@ class MagicEnvelope
         }
 
         $data_element = $env_element->getElementsByTagNameNS(MagicEnvelope::NS, 'data')->item(0);
-        
+        $sig_element = $env_element->getElementsByTagNameNS(MagicEnvelope::NS, 'sig')->item(0);
         return array(
-            'data' => trim($data_element->nodeValue),
+            'data' => preg_replace('/\s/', '', $data_element->nodeValue),
             'data_type' => $data_element->getAttribute('type'),
             'encoding' => $env_element->getElementsByTagNameNS(MagicEnvelope::NS, 'encoding')->item(0)->nodeValue,
             'alg' => $env_element->getElementsByTagNameNS(MagicEnvelope::NS, 'alg')->item(0)->nodeValue,
-            'sig' => $env_element->getElementsByTagNameNS(MagicEnvelope::NS, 'sig')->item(0)->nodeValue,
+            'sig' => preg_replace('/\s/', '', $sig_element->nodeValue),
         );
     }
 
-- 
cgit v1.2.3


From 5549600505fa1b8abc11563eb026d6c40f8e0c37 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sat, 7 Aug 2010 18:33:40 +0200
Subject: Localisation updates from http://translatewiki.net

---
 locale/af/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/ar/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/arz/LC_MESSAGES/statusnet.po   | 12 +++---
 locale/bg/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/br/LC_MESSAGES/statusnet.po    | 74 +++++++++++++++++------------------
 locale/ca/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/cs/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/da/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/de/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/el/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/en_GB/LC_MESSAGES/statusnet.po | 12 +++---
 locale/es/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/fa/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/fi/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/fr/LC_MESSAGES/statusnet.po    | 14 +++----
 locale/ga/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/gl/LC_MESSAGES/statusnet.po    | 50 +++++++++++------------
 locale/he/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/hsb/LC_MESSAGES/statusnet.po   | 12 +++---
 locale/ia/LC_MESSAGES/statusnet.po    | 64 ++++++++++++++----------------
 locale/is/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/it/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/ja/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/ko/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/mk/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/nb/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/nl/LC_MESSAGES/statusnet.po    | 14 +++----
 locale/nn/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/pl/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/pt/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/pt_BR/LC_MESSAGES/statusnet.po | 12 +++---
 locale/ru/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/statusnet.pot                  |  8 ++--
 locale/sv/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/te/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/tr/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/uk/LC_MESSAGES/statusnet.po    | 22 +++++------
 locale/vi/LC_MESSAGES/statusnet.po    | 12 +++---
 locale/zh_CN/LC_MESSAGES/statusnet.po | 12 +++---
 locale/zh_TW/LC_MESSAGES/statusnet.po | 12 +++---
 40 files changed, 317 insertions(+), 325 deletions(-)

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index a1a8a6801..2e4b6b057 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:38+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:23:59+0000\n"
 "Language-Team: Afrikaans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: out-statusnet\n"
@@ -4726,21 +4726,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c5e7f56b8..e0d4701a3 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:39+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:01+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\n"
@@ -4740,21 +4740,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تي @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index dc0555848..0b06f2817 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:41+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:02+0000\n"
 "Language-Team: Egyptian Spoken Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: out-statusnet\n"
@@ -4768,21 +4768,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 4661bc824..3b78847b5 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:42+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:08+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -4920,21 +4920,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 676ef5a27..2b12d7f56 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:44+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:10+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: out-statusnet\n"
@@ -354,9 +354,8 @@ msgid "Could not delete favorite."
 msgstr "Diposupl eo dilemel ar pennroll-mañ."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Diposupl eo heuliañ an implijer : N'eo ket bet kavet an implijer."
+msgstr "Dibosupl eo heuliañ an implijer : n'eo ket bet kavet ar profil."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -503,9 +502,8 @@ msgid "groups on %s"
 msgstr "strolladoù war %s"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "C'hwitet en deus an urzhiad"
+msgstr "Enporzhiadenn c'hwitet."
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -720,7 +718,7 @@ msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #: actions/apitrends.php:87
 msgid "API method under construction."
-msgstr ""
+msgstr "Hentenn API war sevel."
 
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -756,7 +754,7 @@ msgstr ""
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 msgid "User without matching profile."
-msgstr ""
+msgstr "Implijer hep profil klotus."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -2782,6 +2780,9 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"Klask tud e %%site.name%% dre o anv, o lec'hiadur pe o diduadennoù. "
+"Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
+"arouezenn."
 
 #: actions/peoplesearch.php:58
 msgid "People search"
@@ -3233,6 +3234,8 @@ msgstr "Postel"
 #: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
 msgstr ""
+"Implijet hepken evit an hizivadennoù, ar c'hemennoù, pe adtapout gerioù-"
+"tremen"
 
 #: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
@@ -3242,22 +3245,22 @@ msgstr "Anv hiroc'h, ho anv \"gwir\" a zo gwelloc'h"
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #: actions/register.php:528
 #, php-format
 msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Ma zestenn ha ma restroù a zo gwarezet dre copyright gant %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #: actions/register.php:532
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Ma zestenn ha ma restroù a chom dindan ma gwirioù oberour."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 #: actions/register.php:535
 msgid "All rights reserved."
-msgstr ""
+msgstr "Holl gwrioù miret strizh."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
@@ -4702,12 +4705,12 @@ msgstr ""
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:260
 msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Re hir."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
 #: classes/Notice.php:265
 msgid "Problem saving notice. Unknown user."
-msgstr ""
+msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Implijer dianav."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
 #: classes/Notice.php:271
@@ -4745,36 +4748,34 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "An implijer-mañ n'eus profil ebet dezhañ."
+msgstr "Mankout a ra ar profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Diposubl eo enrollañ ali al lec'hienn."
+msgstr "Dibosupl eo enrollañ an tikedenn."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -4810,9 +4811,8 @@ msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Dibosupl eo paouez gant ar c'houmanant."
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5558,7 +5558,7 @@ msgstr ""
 #: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
-msgstr ""
+msgstr "Koumanantet da %s"
 
 #: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
@@ -5567,7 +5567,7 @@ msgstr ""
 #: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
-msgstr ""
+msgstr "Digoumanantiñ da %s"
 
 #: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
@@ -5579,7 +5579,7 @@ msgstr "Kemennoù diweredekaet."
 
 #: lib/command.php:687
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
 
 #: lib/command.php:708
 msgid "Notification on."
@@ -5587,7 +5587,7 @@ msgstr "Kemennoù gweredekaet"
 
 #: lib/command.php:710
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
 
 #: lib/command.php:723
 msgid "Login command is disabled"
@@ -5596,7 +5596,7 @@ msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h"
 #: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
+msgstr "Implijadus eo al liamm-se ur wech hepken, hag e-pad 2 vunutenn : %s"
 
 #: lib/command.php:761
 #, php-format
@@ -5605,7 +5605,7 @@ msgstr "Digoumanantet eus %s"
 
 #: lib/command.php:778
 msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "N'hoc'h ket koumanantet da zen ebet."
 
 #: lib/command.php:780
 #, fuzzy
@@ -5616,7 +5616,7 @@ msgstr[1] "You are subscribed to these people:"
 
 #: lib/command.php:800
 msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Den n'eo koumanantet deoc'h."
 
 #: lib/command.php:802
 #, fuzzy
@@ -5680,7 +5680,7 @@ msgstr ""
 
 #: lib/common.php:135
 msgid "No configuration file found. "
-msgstr ""
+msgstr "N'eo bet kavet restr kefluniadur ebet. "
 
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
@@ -5716,11 +5716,11 @@ msgstr ""
 
 #: lib/dberroraction.php:60
 msgid "Database error"
-msgstr ""
+msgstr "Fazi bank roadennoù"
 
 #: lib/designsettings.php:105
 msgid "Upload file"
-msgstr ""
+msgstr "Enporzhiañ ar restr"
 
 #: lib/designsettings.php:109
 msgid ""
@@ -5733,15 +5733,15 @@ msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
-msgstr ""
+msgstr "Tennañ eus ar pennrolloù"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
-msgstr ""
+msgstr "Ouzhpennañ d'ar pennrolloù"
 
 #: lib/favorform.php:140
 msgid "Favor"
-msgstr ""
+msgstr "Pennrolloù"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index 94bca4e7f..d7de3b4d6 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:45+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:12+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -4992,21 +4992,21 @@ msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 0834169e9..8df43a789 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:47+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:14+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
@@ -4954,21 +4954,21 @@ msgstr "Problém při ukládání sdělení"
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index 772ca0e56..f68253d22 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:48+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:15+0000\n"
 "Language-Team: Danish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: da\n"
 "X-Message-Group: out-statusnet\n"
@@ -4728,21 +4728,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 8154220b7..5a52a7c0c 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -16,12 +16,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:49+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:17+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -5003,14 +5003,14 @@ msgstr "Problem bei Speichern der Nachricht."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -5019,7 +5019,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 704ae6c2a..841e3172c 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:51+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:18+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -4879,21 +4879,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index d4d793a36..6eee49858 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:52+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:20+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -4894,21 +4894,21 @@ msgstr "Problem saving group inbox."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index ae6f2929a..f7e57911c 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:54+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:22+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -4990,21 +4990,21 @@ msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "No se puede revocar rol \"%1$s\" para usuario #%2$d; no existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index 685d96e4a..c5303e341 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:57+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:25+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 
 #. TRANS: Page title
@@ -4934,21 +4934,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index a087c5777..5b1465bc5 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:55+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:23+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
@@ -5057,21 +5057,21 @@ msgstr "Ongelma päivityksen tallentamisessa."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 3246555e1..e9890ef36 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:21:58+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:27+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -4940,7 +4940,7 @@ msgstr "Impossible de créer le jeton d’identification pour %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr "Aucune base de données de nom ou DSN trouvée nulle part."
+msgstr "Aucun nom de base de données ou DSN trouvé nulle part."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -5020,14 +5020,14 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -5036,7 +5036,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index dc3c53286..8d30fb829 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:00+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:29+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
@@ -5114,21 +5114,21 @@ msgstr "Aconteceu un erro ó gardar o chío."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 40e79f782..68434b085 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:01+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:30+0000\n"
 "Language-Team: Galician\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: out-statusnet\n"
@@ -166,7 +166,7 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
@@ -176,7 +176,7 @@ msgstr ""
 "status_textarea=%3$s)."
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
@@ -512,9 +512,8 @@ msgid "groups on %s"
 msgstr "grupos en %s"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "Cargar un ficheiro"
+msgstr "Houbo un erro durante a carga."
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -663,7 +662,7 @@ msgstr "Non se atopou ningún estado con esa ID."
 
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "O cliente debe proporcionar un parámetro de \"estado\" cun valor."
 
 #: actions/apistatusesupdate.php:242 actions/newnotice.php:155
 #: lib/mailhandler.php:60
@@ -3555,7 +3554,7 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Fonte de novas coas respostas a %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
@@ -3573,7 +3572,7 @@ msgstr ""
 "grupos](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
@@ -3953,7 +3952,7 @@ msgstr ""
 "bo momento para comezar :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
@@ -4843,12 +4842,12 @@ msgstr "Autores"
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "Non se pode procesar o URL \"%s\""
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "Robin pensa que algo é imposible."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
@@ -4878,9 +4877,8 @@ msgstr "Un ficheiro deste tamaño excedería a súa cota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "Tamaño non válido."
+msgstr "Nome de ficheiro incorrecto."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -4912,7 +4910,7 @@ msgstr "Non se puido crear un pase de sesión para %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "Non se atopou por ningures o nome da base de datos ou DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -4932,9 +4930,9 @@ msgstr "Non se puido actualizar a mensaxe co novo URI."
 #. 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
-#, fuzzy, php-format
+#, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr "Non existe tal perfil (%d) para a nota (%d)"
+msgstr "Non existe tal perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:190
@@ -4983,7 +4981,7 @@ msgstr "Houbo un problema ao gardar a nota."
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 #: classes/Notice.php:892
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "O tipo dado para saveKnownGroups era incorrecto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:991
@@ -4992,30 +4990,31 @@ msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "♻ @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
+"Non se pode revogar o rol \"%1$s\" do usuario #%2$d: o usuario non existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
+"Non se pode revogar o rol \"%1$s\" do usuario #%2$d: erro na base de datos."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "O usuario non ten perfil."
+msgstr "Falta o perfil de usuario."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
@@ -5044,19 +5043,16 @@ msgstr "Non está subscrito!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "Non se puido borrar a subscrición a si mesmo."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "Non se puido borrar o pase de subscrición OMB."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
 msgstr "Non se puido borrar a subscrición."
 
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index d8d60e729..64c36e84e 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:03+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:32+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -4957,21 +4957,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index e0cc3dc43..860efa66e 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:04+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:33+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: out-statusnet\n"
@@ -4705,21 +4705,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index e0961e447..82541026b 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:07+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:35+0000\n"
 "Language-Team: Interlingua\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: out-statusnet\n"
@@ -3734,24 +3734,24 @@ msgstr ""
 "mitter los in evidentia."
 
 #: actions/showfavorites.php:208
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s non ha ancora addite alcun nota a su favorites. Publica alique "
-"interessante que ille favoritisarea :)"
+"%s non ha ancora addite un nota favorite. Publica alique interessante que "
+"ille adderea a su favorites :)"
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s non ha ancora addite alcun nota a su favorites. Proque non [registrar un "
-"conto](%%%%action.register%%%%) e postea publicar alique interessante que "
-"ille favoritisarea :)"
+"%s non ha ancora addite un nota favorite. Proque non [crear un conto](%%%%"
+"action.register%%%%) e postea publicar alique interessante que ille adderea "
+"a su favorites :)"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3931,13 +3931,13 @@ msgstr ""
 "alcun nota, dunque iste es un bon momento pro comenciar :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Tu pote tentar pulsar %1$s o [publicar un nota a su attention](%%%%action."
-"newnotice%%%%?status_textarea=%2$s)."
+"Tu pote tentar dar un pulsata a %1$s o [publicar un nota a su attention](%%%%"
+"action.newnotice%%%%?status_textarea=%2$s)."
 
 #: actions/showstream.php:243
 #, php-format
@@ -4817,23 +4817,23 @@ msgstr "Autor(es)"
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "Impossibile processar le URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "Robin pensa que alique es impossibile."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"Nulle file pote esser plus grande que %d bytes e le file que tu inviava ha %"
-"d bytes. Tenta incargar un version minus grande."
+"Nulle file pote esser plus grande que %1$d bytes e le file que tu inviava ha "
+"%2$d bytes. Tenta incargar un version minus grande."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4851,9 +4851,8 @@ msgstr "Un file de iste dimension excederea tu quota mensual de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "Dimension invalide."
+msgstr "Nomine de file invalide."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -4885,7 +4884,7 @@ msgstr "Non poteva crear indicio de identification pro %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "Nulle nomine de base de datos o DSN trovate."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -4907,7 +4906,7 @@ msgstr "Non poteva actualisar message con nove URI."
 #: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "Nulle profilo (%1$d) trovate pro le nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:190
@@ -4956,7 +4955,7 @@ msgstr "Problema salveguardar nota."
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 #: classes/Notice.php:892
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "Mal typo fornite a saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:991
@@ -4965,36 +4964,36 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "Non pote revocar le rolo \"%1$s\" del usator #%2$d; non existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
+"Non pote revocar le rolo \"%1$s\" del usator #%2$d; error in le base de "
+"datos."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "Le usator non ha un profilo."
+msgstr "Profilo mancante."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Impossibile salveguardar le aviso del sito."
+msgstr "Impossibile salveguardar le etiquetta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -5018,19 +5017,16 @@ msgstr "Non subscribite!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "Non poteva deler auto-subscription."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "Non poteva deler le indicio OMB del subscription."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
 msgstr "Non poteva deler subscription."
 
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 963d21424..701d0f1d4 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:08+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:37+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -5009,21 +5009,21 @@ msgstr "Vandamál komu upp við að vista babl."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 401889a5c..5bb079af7 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:10+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:38+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -4968,21 +4968,21 @@ msgstr "Problema nel salvare la casella della posta del gruppo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 1141b3427..fab6b3d78 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:11+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:41+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -5001,21 +5001,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index c40002fc5..5b5bb0424 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:13+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:43+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -4982,21 +4982,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 383d7a91a..551c61dce 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:14+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:45+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -4983,14 +4983,14 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -4999,7 +4999,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 6616a6a6b..ab0506e34 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:16+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:47+0000\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -4895,21 +4895,21 @@ msgstr "Problem ved lagring av gruppeinnboks."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index c98e1d84a..8c432b7b1 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:19+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:50+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -4907,7 +4907,7 @@ msgstr ""
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
 msgid "Invalid filename."
-msgstr "Ongeldig bestandsnaam."
+msgstr "Ongeldige bestandsnaam."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -5026,14 +5026,14 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -5042,7 +5042,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 9d1c47205..08b25c9e6 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:17+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:48+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
@@ -5047,21 +5047,21 @@ msgstr "Eit problem oppstod ved lagring av notis."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index fe0581a69..89da186ca 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\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:20+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:52+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ 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.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -4955,21 +4955,21 @@ msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Nie można unieważnić roli \"\"%1$s\" użytkownika #%2$d; nie istnieje."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index f7e479154..ab309b7b3 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:22+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:54+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -4959,14 +4959,14 @@ msgstr "Problema na gravação da caixa de entrada do grupo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -4974,7 +4974,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index cb77836d4..53468a064 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:23+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:55+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -4995,21 +4995,21 @@ msgstr "Problema no salvamento das mensagens recebidas do grupo."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 869212945..7027150bd 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:25+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:57+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
@@ -4971,14 +4971,14 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -4987,7 +4987,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 961810055..81c5a97c4 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: 2010-08-03 13:21+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+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"
@@ -4679,21 +4679,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 68ba9a6a9..16a0858ea 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:26+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:24:59+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -4957,21 +4957,21 @@ msgstr "Problem med att spara gruppinkorg."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index e83ab4a30..bd506b98a 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:28+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:01+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -4842,21 +4842,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 18140c3e0..029f36db1 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:29+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:03+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
@@ -4960,21 +4960,21 @@ msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 73ae72166..8e1e37ced 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:31+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:05+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -4960,21 +4960,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "Не вдалося скасувати роль «%s» для користувача #%2$s; не існує."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -6210,17 +6210,17 @@ msgid ""
 "Thanks for your time, \n"
 "%s\n"
 msgstr ""
-"Агов, %s.\n"
+"Агов, %s!\n"
 "\n"
 "Хтось щойно ввів цю електронну адресу на %s.\n"
 "\n"
-"Якщо то були Ви, мусите це підтвердити використовуючи посилання:\n"
+"Якщо то були Ви, мусите це підтвердити, використовуючи посилання:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"А якщо ні, то просто проігноруйте це повідомлення.\n"
+"А якщо ні, просто ігноруйте це повідомлення.\n"
 "\n"
-"Дякуємо за Ваш час \n"
+"Вибачте за турботу, \n"
 "%s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index 60164da4d..c82d34e66 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:32+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:06+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -5103,21 +5103,21 @@ msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%s (%s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index bd331de65..9de9d8e75 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:34+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:08+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -5045,21 +5045,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 1e5b44ae6..be09ed6d7 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-03 13:21+0000\n"
-"PO-Revision-Date: 2010-08-03 13:22:35+0000\n"
+"POT-Creation-Date: 2010-08-07 16:23+0000\n"
+"PO-Revision-Date: 2010-08-07 16:25:10+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70381); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -4868,21 +4868,21 @@ 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:1614
+#: classes/Notice.php:1745
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:740
+#: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:749
+#: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
-- 
cgit v1.2.3


From 09dee24cbeadfb1fef797d38265e2ece09266bb0 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 8 Aug 2010 21:13:21 +0200
Subject: Add two i18n related FIXMEs.

---
 lib/mailbox.php    | 1 +
 lib/noticelist.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/mailbox.php b/lib/mailbox.php
index 90a58b4c4..2b00f5ffd 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -224,6 +224,7 @@ class MailboxAction extends CurrentUserDesignAction
 
         if ($message->source) {
             $this->elementStart('span', 'source');
+            // FIXME: bad i18n. Device should be a parameter (from %s).
             $this->text(_('from'));
             $this->element('span', 'device', $this->showSource($message->source));
             $this->elementEnd('span');
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 252e1ca90..dbc5bfb51 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -502,6 +502,7 @@ class NoticeListItem extends Widget
             $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
             $this->out->text(' ');
             $this->out->elementStart('span', 'source');
+            // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
             $this->out->text(_('from'));
             $this->out->text(' ');
 
-- 
cgit v1.2.3


From 6a2659ed67577b3f33c5c4d55067744a4b812a06 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Tue, 10 Aug 2010 11:45:34 -0700
Subject: Workaround for index setup on SubMirror until I'm done w/ arbitrary
 index support for Schema setup.

---
 lib/mysqlschema.php                     |  2 +-
 plugins/SubMirror/SubMirrorPlugin.php   |  3 +++
 plugins/SubMirror/classes/SubMirror.php | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/mysqlschema.php b/lib/mysqlschema.php
index 464c718f9..f9552c1dc 100644
--- a/lib/mysqlschema.php
+++ b/lib/mysqlschema.php
@@ -333,7 +333,7 @@ class MysqlSchema extends Schema
         }
 
         if (empty($name)) {
-            $name = "$table_".implode("_", $columnNames)."_idx";
+            $name = "{$table}_".implode("_", $columnNames)."_idx";
         }
 
         $res = $this->conn->query("ALTER TABLE $table ".
diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php
index 7289e7793..80c6c5a88 100644
--- a/plugins/SubMirror/SubMirrorPlugin.php
+++ b/plugins/SubMirror/SubMirrorPlugin.php
@@ -120,6 +120,9 @@ class SubMirrorPlugin extends Plugin
     {
         $schema = Schema::get();
         $schema->ensureTable('submirror', SubMirror::schemaDef());
+
+        // @hack until key definition support is merged
+        SubMirror::fixIndexes($schema);
         return true;
     }
 
diff --git a/plugins/SubMirror/classes/SubMirror.php b/plugins/SubMirror/classes/SubMirror.php
index 4e7e005db..bd8fc80a5 100644
--- a/plugins/SubMirror/classes/SubMirror.php
+++ b/plugins/SubMirror/classes/SubMirror.php
@@ -76,6 +76,22 @@ class SubMirror extends Memcached_DataObject
                                    null, false));
     }
 
+    /**
+     * Temporary hack to set up the compound index, since we can't do
+     * it yet through regular Schema interface. (Coming for 1.0...)
+     * 
+     * @param Schema $schema
+     * @return void
+     */
+    static function fixIndexes($schema)
+    {
+        try {
+            $schema->createIndex('submirror', array('subscribed', 'subscriber'));
+        } catch (Exception $e) {
+            common_log(LOG_ERR, __METHOD__ . ': ' . $e->getMessage());
+        }
+    }
+
     /**
      * return key definitions for DB_DataObject
      *
-- 
cgit v1.2.3


From 9a53be4669e53ba343f4c6433405ae8de747a86f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 2 Aug 2010 16:08:54 -0700
Subject: Initial support for third-party fallback hub such as Superfeedr for
 feed subscriptions. If set up, this hub will be used to subscribe to feeds
 that don't specify a hub of their own. Assumes that the fallback hub will, in
 fact, handle polling and updates for any feed we throw at it! Authentication
 may be specified for the fallback hub.

Example:

  $config['feedsub']['fallback_hub'] = 'https://superfeedr.com/hubbub';
  $config['feedsub']['hub_user'] = 'abcd';
  $config['feedsub']['hub_pass'] = 'ckcmdkmckdmkcdk';

Also:
* Fix for WordPress-RSS-via-Superfeedr-Atom; if we have <author> info but no ID from a native ActivityStreams actor, don't freak out in the low-level processing code that checks for identity matches.
* enhanced messages for low-level FeedSub exceptions if they make it to outside display
---
 plugins/OStatus/OStatusPlugin.php           |  9 +++++++
 plugins/OStatus/README                      | 39 +++++++++++++++++++++++------
 plugins/OStatus/classes/FeedSub.php         | 32 +++++++++++++++++++----
 plugins/OStatus/classes/Ostatus_profile.php | 16 ++++++++----
 plugins/OStatus/lib/feeddiscovery.php       | 10 ++++++++
 plugins/OStatus/scripts/update-profile.php  |  2 +-
 6 files changed, 89 insertions(+), 19 deletions(-)

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 3b073a5d1..6fef20d6f 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -28,6 +28,15 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ext
 
 class FeedSubException extends Exception
 {
+    function __construct($msg=null)
+    {
+        $type = get_class($this);
+        if ($msg) {
+            parent::__construct("$type: $msg");
+        } else {
+            parent::__construct($type);
+        }
+    }
 }
 
 class OStatusPlugin extends Plugin
diff --git a/plugins/OStatus/README b/plugins/OStatus/README
index 3a98b7b25..ea5dfc055 100644
--- a/plugins/OStatus/README
+++ b/plugins/OStatus/README
@@ -1,18 +1,42 @@
-Plugin to support importing updates from external RSS and Atom feeds into your timeline.
+Plugin to support importing and exporting notices through Atom and RSS feeds.
+The OStatus plugin concentrates on user-to-user cases for federating StatusNet
+and similar social networking / microblogging / blogging sites, but includes
+low-level feed subscription systems which are used by some other plugins.
+
+Uses PubSubHubbub for push feed updates; currently non-PuSH feeds cannot be
+subscribed unless an external PuSH hub proxy is used.
 
-Uses PubSubHubbub for push feed updates; currently non-PuSH feeds cannot be subscribed.
 
 Configuration options available:
 
 $config['ostatus']['hub']
     (default internal hub)
-    Set to URL of an external PuSH hub to use it instead of our internal hub.
+    Set to URL of an external PuSH hub to use it instead of our internal hub
+    for sending outgoing updates in user and group feeds.
 
 $config['ostatus']['hub_retries']
     (default 0)
     Number of times to retry a PuSH send to consumers if using internal hub
 
 
+Settings controlling incoming feed subscription:
+
+$config['feedsub']['fallback_hub']
+    To subscribe to feeds that don't have a hub, an external PuSH proxy hub
+    such as Superfeedr may be used. Any feed without a hub of its own will
+    be subscribed through the specified hub URL instead. If the external hub
+    has usage charges, be aware that there is no restriction placed to how
+    many feeds may be subscribed!
+
+    $config['feedsub']['fallback_hub'] = 'https://superfeedr.com/hubbub';
+
+$config['feedsub']['hub_user']
+$config['feedsub']['hub_password']
+    If using the fallback hub mode, these settings may be used to provide
+    HTTP authentication credentials for contacting the hub. Default hubs
+    specified from feeds are assumed to not require
+
+
 For testing, shouldn't be used in production:
 
 $config['ostatus']['skip_signatures']
@@ -23,12 +47,11 @@ $config['feedsub']['nohub']
     (default require hub)
     Allow low-level feed subscription setup for feeds without hubs.
     Not actually usable at this stage, OStatus will check for hubs too
-    and we have no polling backend.
+    and we have no polling backend. (The fallback hub option can be used
+    with a 3rd-party service to provide such polling.)
 
 
 Todo:
-* fully functional l10n
-* redo non-OStatus feed support
-** rssCloud support?
-** possibly a polling daemon to support non-PuSH feeds?
+* better support for feeds that aren't natively oriented at social networking
 * make use of tags/categories from feeds
+* better repeat handling
diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index 9cd35e29c..dd1968db1 100644
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -207,8 +207,8 @@ class FeedSub extends Memcached_DataObject
         $discover = new FeedDiscovery();
         $discover->discoverFromFeedURL($feeduri);
 
-        $huburi = $discover->getAtomLink('hub');
-        if (!$huburi) {
+        $huburi = $discover->getHubLink();
+        if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
             throw new FeedSubNoHubException();
         }
 
@@ -241,8 +241,12 @@ class FeedSub extends Memcached_DataObject
             common_log(LOG_WARNING, "Attempting to (re)start PuSH subscription to $this->uri in unexpected state $this->sub_state");
         }
         if (empty($this->huburi)) {
-            if (common_config('feedsub', 'nohub')) {
+            if (common_config('feedsub', 'fallback_hub')) {
+                // No native hub on this feed?
+                // Use our fallback hub, which handles polling on our behalf.
+            } else if (common_config('feedsub', 'nohub')) {
                 // Fake it! We're just testing remote feeds w/o hubs.
+                // We'll never actually get updates in this mode.
                 return true;
             } else {
                 throw new ServerException("Attempting to start PuSH subscription for feed with no hub");
@@ -267,8 +271,12 @@ class FeedSub extends Memcached_DataObject
             common_log(LOG_WARNING, "Attempting to (re)end PuSH subscription to $this->uri in unexpected state $this->sub_state");
         }
         if (empty($this->huburi)) {
-            if (common_config('feedsub', 'nohub')) {
+            if (common_config('feedsub', 'fallback_hub')) {
+                // No native hub on this feed?
+                // Use our fallback hub, which handles polling on our behalf.
+            } else if (common_config('feedsub', 'nohub')) {
                 // Fake it! We're just testing remote feeds w/o hubs.
+                // We'll never actually get updates in this mode.
                 return true;
             } else {
                 throw new ServerException("Attempting to end PuSH subscription for feed with no hub");
@@ -326,7 +334,21 @@ class FeedSub extends Memcached_DataObject
                           'hub.secret' => $this->secret,
                           'hub.topic' => $this->uri);
             $client = new HTTPClient();
-            $response = $client->post($this->huburi, $headers, $post);
+            if ($this->huburi) {
+                $hub = $this->huburi;
+            } else {
+                if (common_config('feedsub', 'fallback_hub')) {
+                    $hub = common_config('feedsub', 'fallback_hub');
+                    if (common_config('feedsub', 'hub_user')) {
+                        $u = common_config('feedsub', 'hub_user');
+                        $p = common_config('feedsub', 'hub_pass');
+                        $client->setAuth($u, $p);
+                    }
+                } else {
+                    throw new FeedSubException('WTF?');
+                }
+            }
+            $response = $client->post($hub, $headers, $post);
             $status = $response->getStatus();
             if ($status == 202) {
                 common_log(LOG_INFO, __METHOD__ . ': sub req ok, awaiting verification callback');
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 2d7c632e6..77a5e22cc 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -493,8 +493,14 @@ class Ostatus_profile extends Memcached_DataObject
                 // OK here! assume the default
             } else if ($actor->id == $this->uri || $actor->link == $this->uri) {
                 $this->updateFromActivityObject($actor);
-            } else {
+            } else if ($actor->id) {
+                // We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner.
+                // This isn't what we expect from mainline OStatus person feeds!
+                // Group feeds go down another path, with different validation.
                 throw new Exception("Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}");
+            } else {
+                // Plain <author> without ActivityStreams actor info.
+                // We'll just ignore this info for now and save the update under the feed's identity.
             }
 
             $oprofile = $this;
@@ -869,12 +875,12 @@ class Ostatus_profile extends Memcached_DataObject
         $feeduri = $discover->discoverFromFeedURL($feed_url);
         $hints['feedurl'] = $feeduri;
 
-        $huburi = $discover->getAtomLink('hub');
+        $huburi = $discover->getHubLink();
         $hints['hub'] = $huburi;
         $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
         $hints['salmon'] = $salmonuri;
 
-        if (!$huburi) {
+        if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
             // We can only deal with folks with a PuSH hub
             throw new FeedSubNoHubException();
         }
@@ -1270,10 +1276,10 @@ class Ostatus_profile extends Memcached_DataObject
                 $discover = new FeedDiscovery();
                 $discover->discoverFromFeedURL($hints['feedurl']);
             }
-            $huburi = $discover->getAtomLink('hub');
+            $huburi = $discover->getHubLink();
         }
 
-        if (!$huburi) {
+        if (!$huburi && !common_config('feedsub', 'fallback_hub')) {
             // We can only deal with folks with a PuSH hub
             throw new FeedSubNoHubException();
         }
diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index 4ac243832..a55399d7c 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -87,6 +87,16 @@ class FeedDiscovery
         return ActivityUtils::getLink($this->root, $rel, $type);
     }
 
+    /**
+     * Get the referenced PuSH hub link from an Atom feed.
+     *
+     * @return mixed string or false
+     */
+    public function getHubLink()
+    {
+        return $this->getAtomLink('hub');
+    }
+
     /**
      * @param string $url
      * @param bool $htmlOk pass false here if you don't want to follow web pages.
diff --git a/plugins/OStatus/scripts/update-profile.php b/plugins/OStatus/scripts/update-profile.php
index d06de4f90..64afa0f35 100644
--- a/plugins/OStatus/scripts/update-profile.php
+++ b/plugins/OStatus/scripts/update-profile.php
@@ -55,7 +55,7 @@ print "Re-running feed discovery for profile URL $oprofile->uri\n";
 // @fixme will bork where the URI isn't the profile URL for now
 $discover = new FeedDiscovery();
 $feedurl = $discover->discoverFromURL($oprofile->uri);
-$huburi = $discover->getAtomLink('hub');
+$huburi = $discover->getHubLink();
 $salmonuri = $discover->getAtomLink(Salmon::NS_REPLIES);
 
 print "  Feed URL: $feedurl\n";
-- 
cgit v1.2.3


From 4fdfc6b1ce7e5ffa50b24bdddca55cc73d54a09f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Tue, 10 Aug 2010 13:19:27 -0700
Subject: Fix for FeedDiscovery test cases: note that some test cases with
 relative URLs fail that include a schema but not a host. Not 100% sure those
 are legit, need to check.

---
 plugins/OStatus/tests/FeedDiscoveryTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/OStatus/tests/FeedDiscoveryTest.php b/plugins/OStatus/tests/FeedDiscoveryTest.php
index 1c5249701..0e6354a86 100644
--- a/plugins/OStatus/tests/FeedDiscoveryTest.php
+++ b/plugins/OStatus/tests/FeedDiscoveryTest.php
@@ -10,7 +10,7 @@ define('STATUSNET', true);
 define('LACONICA', true);
 
 require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/plugins/FeedSub/feedsub.php';
+require_once INSTALLDIR . '/plugins/OStatus/lib/feeddiscovery.php';
 
 class FeedDiscoveryTest extends PHPUnit_Framework_TestCase
 {
-- 
cgit v1.2.3


From 08fc6053ec55e911b842fd05dafc5e0c99c4e992 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Tue, 10 Aug 2010 13:36:38 -0700
Subject: Fix for regression with OStatus mention processing (duplicated new
 and old style lead to trying to save a reply entry twice).

---
 classes/Notice.php                          | 7 ++++---
 lib/activitycontext.php                     | 6 ++++--
 plugins/OStatus/classes/Ostatus_profile.php | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 4646fc6ab..0eeebfadf 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -485,7 +485,7 @@ class Notice extends Memcached_DataObject
     function saveKnownUrls($urls)
     {
         // @fixme validation?
-        foreach ($urls as $url) {
+        foreach (array_unique($urls) as $url) {
             File::processNew($url, $this->id);
         }
     }
@@ -893,7 +893,7 @@ class Notice extends Memcached_DataObject
         }
 
         $groups = array();
-        foreach ($group_ids as $id) {
+        foreach (array_unique($group_ids) as $id) {
             $group = User_group::staticGet('id', $id);
             if ($group) {
                 common_log(LOG_ERR, "Local delivery to group id $id, $group->nickname");
@@ -1016,7 +1016,7 @@ class Notice extends Memcached_DataObject
         }
         $sender = Profile::staticGet($this->profile_id);
 
-        foreach ($uris as $uri) {
+        foreach (array_unique($uris) as $uri) {
 
             $user = User::staticGet('uri', $uri);
 
@@ -1029,6 +1029,7 @@ class Notice extends Memcached_DataObject
 
                 $reply->notice_id  = $this->id;
                 $reply->profile_id = $user->id;
+                common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $user->id");
 
                 $id = $reply->insert();
             }
diff --git a/lib/activitycontext.php b/lib/activitycontext.php
index 5afbb7fd2..09a457924 100644
--- a/lib/activitycontext.php
+++ b/lib/activitycontext.php
@@ -71,6 +71,7 @@ class ActivityContext
 
         $links = $element->getElementsByTagNameNS(ActivityUtils::ATOM, ActivityUtils::LINK);
 
+        $attention = array();
         for ($i = 0; $i < $links->length; $i++) {
 
             $link = $links->item($i);
@@ -80,11 +81,12 @@ class ActivityContext
             // XXX: Deprecate this in favour of "mentioned" from Salmon spec
             // http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#SALR
             if ($linkRel == self::ATTENTION) {
-                $this->attention[] = $link->getAttribute(self::HREF);
+                $attention[] = $link->getAttribute(self::HREF);
             } elseif ($linkRel == self::MENTIONED) {
-                $this->attention[] = $link->getAttribute(self::HREF);
+                $attention[] = $link->getAttribute(self::HREF);
             }
         }
+        $this->attention = array_unique($attention);
     }
 
     /**
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 77a5e22cc..8f8eb773f 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -681,7 +681,7 @@ class Ostatus_profile extends Memcached_DataObject
         common_log(LOG_DEBUG, "Original reply recipients: " . implode(', ', $attention_uris));
         $groups = array();
         $replies = array();
-        foreach ($attention_uris as $recipient) {
+        foreach (array_unique($attention_uris) as $recipient) {
             // Is the recipient a local user?
             $user = User::staticGet('uri', $recipient);
             if ($user) {
-- 
cgit v1.2.3


From 5c210f724a865830d0c39feba8386f495b18ee4f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Tue, 10 Aug 2010 16:28:33 -0700
Subject: update version for 0.9.4beta1

---
 lib/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/common.php b/lib/common.php
index 817434b97..ddd06bf92 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.3');
+define('STATUSNET_VERSION', '0.9.4beta1');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Half a World Away');
+define('STATUSNET_CODENAME', 'Orange Crush');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
-- 
cgit v1.2.3


From 19e6b84050ffc855183ec6e6f022e5d1190b3425 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Tue, 10 Aug 2010 17:22:26 -0700
Subject: StatusNet_network staticGet lookup fix

---
 lib/statusnet.php         | 2 +-
 lib/stompqueuemanager.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 2aa73486e..7212a4a47 100644
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -141,7 +141,7 @@ class StatusNet
             return true;
         }
 
-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
         if (empty($sn)) {
             return false;
             throw new Exception("No such site nickname '$nickname'");
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 91faa8c36..fc98c77d4 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -649,7 +649,7 @@ class StompQueueManager extends QueueManager
      */
     protected function updateSiteConfig($nickname)
     {
-        $sn = Status_network::staticGet($nickname);
+        $sn = Status_network::staticGet('nickname', $nickname);
         if ($sn) {
             $this->switchSite($nickname);
             if (!in_array($nickname, $this->sites)) {
-- 
cgit v1.2.3


From 3062cc270607ad60993e5e6d6e3977fab74508b0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 10 Aug 2010 23:35:47 -0700
Subject: add last-modified header to sitemaps to keep them from getting
 regenerated

---
 plugins/Sitemap/sitemapaction.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/plugins/Sitemap/sitemapaction.php b/plugins/Sitemap/sitemapaction.php
index 45edfccc5..73b9248a3 100644
--- a/plugins/Sitemap/sitemapaction.php
+++ b/plugins/Sitemap/sitemapaction.php
@@ -53,6 +53,8 @@ class SitemapAction extends Action
 
     function handle($args)
     {
+        parent::handle($args);
+
         header('Content-Type: text/xml; charset=UTF-8');
         $this->startXML();
 
@@ -67,6 +69,27 @@ class SitemapAction extends Action
         $this->endXML();
     }
 
+    function lastModified()
+    {
+        $y = $this->trimmed('year');
+
+        $m = $this->trimmed('month');
+        $d = $this->trimmed('day');
+
+        $y += 0;
+        $m += 0;
+        $d += 0;
+
+        $begdate = strtotime("$y-$m-$d 00:00:00");
+        $enddate = $begdate + (24 * 60 * 60);
+
+        if ($enddate < time()) {
+            return $enddate;
+        } else {
+            return null;
+        }
+    }
+
     function showUrl($url, $lastMod=null, $changeFreq=null, $priority=null)
     {
         $this->elementStart('url');
-- 
cgit v1.2.3


From f659a46083ead9003ff7f258375b74718d9ee6e9 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Wed, 11 Aug 2010 12:34:22 +0200
Subject: Localisation updates from http://translstewiki.net

---
 locale/af/LC_MESSAGES/statusnet.po    | 1067 ++++++++++++++++++++-------------
 locale/br/LC_MESSAGES/statusnet.po    |  488 +++++++++------
 locale/en_GB/LC_MESSAGES/statusnet.po |  199 +++---
 locale/fr/LC_MESSAGES/statusnet.po    |   26 +-
 locale/ia/LC_MESSAGES/statusnet.po    |   26 +-
 locale/ko/LC_MESSAGES/statusnet.po    |  965 ++++++++++++++---------------
 locale/mk/LC_MESSAGES/statusnet.po    |   30 +-
 locale/nl/LC_MESSAGES/statusnet.po    |   28 +-
 locale/statusnet.pot                  |   22 +-
 locale/uk/LC_MESSAGES/statusnet.po    |   26 +-
 locale/zh_CN/LC_MESSAGES/statusnet.po |  816 +++++++++++--------------
 locale/zh_TW/LC_MESSAGES/statusnet.po |  994 +++++++++++++++---------------
 12 files changed, 2417 insertions(+), 2270 deletions(-)

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 2e4b6b057..cf8caed59 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:23:59+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:11:11+0000\n"
 "Language-Team: Afrikaans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: out-statusnet\n"
@@ -85,9 +85,8 @@ msgstr "Stoor"
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "Hierdie bladsy bestaan nie"
+msgstr "Hierdie bladsy bestaan nie."
 
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
@@ -355,7 +354,6 @@ msgstr ""
 "Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
 msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
 
@@ -379,12 +377,14 @@ msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
 #: actions/apifriendshipsshow.php:134
+#, fuzzy
 msgid "Could not determine source user."
-msgstr ""
+msgstr "Kon nie die gebruiker opdateer nie."
 
 #: actions/apifriendshipsshow.php:142
+#, fuzzy
 msgid "Could not find target user."
-msgstr ""
+msgstr "Kon nie die gebruiker opdateer nie."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -458,7 +458,7 @@ msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 #, fuzzy
 msgid "Group not found."
-msgstr "Groep nie gevind nie!"
+msgstr "Nie gevind nie."
 
 #: actions/apigroupjoin.php:111 actions/joingroup.php:100
 msgid "You are already a member of that group."
@@ -469,18 +469,18 @@ msgid "You have been blocked from that group by the admin."
 msgstr ""
 
 #: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, php-format
+#, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr ""
+msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
-msgstr ""
+msgstr "U is nie 'n lid van die groep nie."
 
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, php-format
+#, fuzzy, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr ""
+msgstr "Kon nie die groep skep nie."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -542,8 +542,9 @@ msgid "Invalid nickname / password!"
 msgstr "Ongeldige gebruikersnaam of wagwoord!"
 
 #: actions/apioauthauthorize.php:159
+#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr ""
+msgstr "Moenie die applikasie verwyder nie"
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
@@ -678,14 +679,14 @@ msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Gunstelinge van %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr ""
+msgstr "%1$s / Gunstelinge van %2$s"
 
 #: actions/apitimelinementions.php:118
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgstr "%1$s / Gunstelinge van %2$s"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -693,9 +694,9 @@ msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, php-format
+#, fuzzy, php-format
 msgid "%s public timeline"
-msgstr ""
+msgstr "%s tydlyn"
 
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
@@ -713,18 +714,19 @@ msgid "Repeats of %s"
 msgstr "Herhalings van %s"
 
 #: actions/apitimelinetag.php:105 actions/tag.php:67
-#, php-format
+#, fuzzy, php-format
 msgid "Notices tagged with %s"
-msgstr ""
+msgstr "met die etiket %s"
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
+#, fuzzy, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/apitrends.php:87
+#, fuzzy
 msgid "API method under construction."
-msgstr ""
+msgstr "Die API-funksie is nie gevind nie."
 
 #: actions/attachment.php:73
 msgid "No such attachment."
@@ -759,8 +761,9 @@ msgstr ""
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
+#, fuzzy
 msgid "User without matching profile."
-msgstr ""
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -778,7 +781,7 @@ msgid "Preview"
 msgstr "Voorskou"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Skrap"
 
@@ -837,7 +840,6 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
@@ -856,7 +858,6 @@ msgstr "Moenie hierdie gebruiker blokkeer nie"
 #: actions/block.php:160 actions/deleteapplication.php:161
 #: actions/deletenotice.php:154 actions/deleteuser.php:159
 #: actions/groupblock.php:185
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
@@ -885,18 +886,19 @@ msgid "No such group."
 msgstr "Die groep bestaan nie."
 
 #: actions/blockedfromgroup.php:97
-#, php-format
+#, fuzzy, php-format
 msgid "%s blocked profiles"
-msgstr ""
+msgstr "%s geblokkeerde gebruikers"
 
 #: actions/blockedfromgroup.php:100
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr ""
+msgstr "%1$s en vriende, bladsy %2$d"
 
 #: actions/blockedfromgroup.php:115
+#, fuzzy
 msgid "A list of the users blocked from joining this group."
-msgstr ""
+msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
@@ -914,19 +916,21 @@ msgstr "Deblokkeer hierdie gebruiker"
 #: actions/bookmarklet.php:51
 #, fuzzy, php-format
 msgid "Post to %s"
-msgstr "Stuur aan "
+msgstr "groepe op %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Geen bevestigingskode."
 
 #: actions/confirmaddress.php:80
+#, fuzzy
 msgid "Confirmation code not found."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #: actions/confirmaddress.php:85
+#, fuzzy
 msgid "That confirmation code is not for you!"
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
@@ -936,8 +940,9 @@ msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
+#, fuzzy
 msgid "That address has already been confirmed."
-msgstr ""
+msgstr "Die E-posadres bestaan reeds."
 
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
@@ -958,7 +963,7 @@ msgstr "Kon nie gebruiker opdateer nie."
 #: actions/confirmaddress.php:128 actions/emailsettings.php:433
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
-msgstr ""
+msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #: actions/confirmaddress.php:146
 msgid "Confirm address"
@@ -980,7 +985,7 @@ msgstr "Kennisgewings"
 
 #: actions/deleteapplication.php:63
 msgid "You must be logged in to delete an application."
-msgstr ""
+msgstr "U moet aangeteken alvorens u 'n aansoek kan skrap."
 
 #: actions/deleteapplication.php:71
 msgid "Application not found."
@@ -1053,7 +1058,7 @@ msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
@@ -1098,7 +1103,7 @@ msgstr "Die logo-URL is ongeldig."
 #: actions/designadminpanel.php:322
 #, fuzzy, php-format
 msgid "Theme not available: %s."
-msgstr "Tema is nie beskikbaar nie: %s"
+msgstr "IM is nie beskikbaar nie."
 
 #: actions/designadminpanel.php:426
 msgid "Change logo"
@@ -1156,12 +1161,14 @@ msgid "Off"
 msgstr "Af"
 
 #: actions/designadminpanel.php:545 lib/designsettings.php:156
+#, fuzzy
 msgid "Turn background image on or off."
-msgstr ""
+msgstr "Verander die agtergrond-prent"
 
 #: actions/designadminpanel.php:550 lib/designsettings.php:161
+#, fuzzy
 msgid "Tile background image"
-msgstr ""
+msgstr "Verander die agtergrond-prent"
 
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
@@ -1185,7 +1192,7 @@ msgstr "Skakels"
 
 #: actions/designadminpanel.php:651
 msgid "Advanced"
-msgstr ""
+msgstr "Gevorderd"
 
 #: actions/designadminpanel.php:655
 msgid "Custom CSS"
@@ -1196,8 +1203,9 @@ msgid "Use defaults"
 msgstr "Gebruik verstekwaardes"
 
 #: actions/designadminpanel.php:677 lib/designsettings.php:248
+#, fuzzy
 msgid "Restore default designs"
-msgstr ""
+msgstr "Gebruik verstekwaardes"
 
 #: actions/designadminpanel.php:683 lib/designsettings.php:254
 msgid "Reset back to default"
@@ -1368,7 +1376,6 @@ msgstr "Huidige bevestigde e-posadres."
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwyder"
@@ -1385,7 +1392,6 @@ msgstr ""
 #. TRANS: Button label
 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Kanselleer"
@@ -1400,7 +1406,6 @@ msgstr "E-posadres, soos \"UserName@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "Voeg by"
@@ -1426,7 +1431,6 @@ msgstr ""
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuut"
@@ -1435,7 +1439,7 @@ msgstr "Nuut"
 #: actions/emailsettings.php:174
 #, fuzzy
 msgid "Email preferences"
-msgstr "Voorkeure"
+msgstr "E-posadresse"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1469,8 +1473,9 @@ msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:219
+#, fuzzy
 msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
@@ -1485,8 +1490,9 @@ msgstr "Geen e-posadres."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
+#, fuzzy
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
@@ -1501,16 +1507,18 @@ msgstr "Dit is al reeds u e-posadres."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:374
+#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:391 actions/imsettings.php:348
 #: actions/smssettings.php:373
+#, fuzzy
 msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:398
@@ -1524,8 +1532,9 @@ msgstr ""
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #: actions/emailsettings.php:419 actions/imsettings.php:383
 #: actions/smssettings.php:408
+#, fuzzy
 msgid "No pending confirmation to cancel."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
@@ -1537,7 +1546,7 @@ msgstr "Dit is die verkeerde IM-adres."
 #: actions/emailsettings.php:438
 #, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Bevestiging gekanselleer."
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1549,7 +1558,7 @@ msgstr "Dit is nie u e-posadres nie."
 #: actions/emailsettings.php:479
 #, fuzzy
 msgid "The email address was removed."
-msgstr "Die adres is verwyder."
+msgstr "Inkomende e-posadres is verwyder."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1569,16 +1578,19 @@ msgstr "Inkomende e-posadres is verwyder."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #: actions/emailsettings.php:532 actions/smssettings.php:605
+#, fuzzy
 msgid "New incoming email address added."
-msgstr ""
+msgstr "Geen inkomende e-posadres."
 
 #: actions/favor.php:79
+#, fuzzy
 msgid "This notice is already a favorite!"
-msgstr ""
+msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
 
 #: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
 msgid "Disfavor favorite"
-msgstr ""
+msgstr "Voeg by gunstelinge"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
@@ -1618,9 +1630,9 @@ msgid "%s's favorite notices"
 msgstr "%s se gunsteling kennisgewings"
 
 #: actions/favoritesrss.php:115
-#, php-format
+#, fuzzy, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1650,8 +1662,9 @@ msgid "No attachments."
 msgstr "Geen aanhangsels."
 
 #: actions/file.php:51
+#, fuzzy
 msgid "No uploaded attachments."
-msgstr ""
+msgstr "Geen aanhangsels."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1662,8 +1675,9 @@ msgid "User being listened to does not exist."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#, fuzzy
 msgid "You can use the local subscription!"
-msgstr ""
+msgstr "U kan slegs lokale gebruikers verwyder."
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
@@ -1703,12 +1717,14 @@ msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
+#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #: actions/grantrole.php:82
+#, fuzzy
 msgid "User already has this role."
-msgstr ""
+msgstr "Hierdie gebruiker is reeds stilgemaak."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1732,12 +1748,14 @@ msgid "Only an admin can block group members."
 msgstr ""
 
 #: actions/groupblock.php:95
+#, fuzzy
 msgid "User is already blocked from group."
-msgstr ""
+msgstr "Hierdie gebruiker is reeds stilgemaak."
 
 #: actions/groupblock.php:100
+#, fuzzy
 msgid "User is not a member of group."
-msgstr ""
+msgstr "U is nie 'n lid van die groep nie."
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 msgid "Block user from group"
@@ -1753,8 +1771,9 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
+#, fuzzy
 msgid "Do not block this user from this group"
-msgstr ""
+msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
@@ -1762,20 +1781,23 @@ msgid "Block this user from this group"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #: actions/groupblock.php:206
+#, fuzzy
 msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Gee gebruiker weer toegang tot die groep"
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 
 #: actions/groupdesignsettings.php:68
+#, fuzzy
 msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
 
 #: actions/groupdesignsettings.php:144
+#, fuzzy
 msgid "Group design"
-msgstr ""
+msgstr "Groepe"
 
 #: actions/groupdesignsettings.php:155
 msgid ""
@@ -1785,12 +1807,14 @@ msgstr ""
 
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
+#, fuzzy
 msgid "Couldn't update your design."
-msgstr ""
+msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#, fuzzy
 msgid "Design preferences saved."
-msgstr ""
+msgstr "Voorkeure is gestoor."
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
@@ -1820,13 +1844,14 @@ msgid "%s group members"
 msgstr "lede van die groep %s"
 
 #: actions/groupmembers.php:103
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s group members, page %2$d"
-msgstr ""
+msgstr "%1$s groepe, bladsy %2$d"
 
 #: actions/groupmembers.php:118
+#, fuzzy
 msgid "A list of the users in this group."
-msgstr ""
+msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
@@ -1837,8 +1862,9 @@ msgid "Block"
 msgstr "Blokkeer"
 
 #: actions/groupmembers.php:487
+#, fuzzy
 msgid "Make user an admin of the group"
-msgstr ""
+msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig."
 
 #: actions/groupmembers.php:519
 msgid "Make Admin"
@@ -1859,9 +1885,9 @@ msgstr "%s tydlyn"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, php-format
+#, fuzzy, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1895,8 +1921,9 @@ msgid ""
 msgstr ""
 
 #: actions/groupsearch.php:58
+#, fuzzy
 msgid "Group search"
-msgstr ""
+msgstr "Soek gebruikers"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
@@ -1922,8 +1949,9 @@ msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
+#, fuzzy
 msgid "User is not blocked from group."
-msgstr ""
+msgstr "Gee gebruiker weer toegang tot die groep"
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
@@ -1956,8 +1984,9 @@ msgid "IM address"
 msgstr "IP-adres"
 
 #: actions/imsettings.php:113
+#, fuzzy
 msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
+msgstr "Huidige bevestigde e-posadres."
 
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
@@ -1981,7 +2010,7 @@ msgstr ""
 #: actions/imsettings.php:155
 #, fuzzy
 msgid "IM preferences"
-msgstr "Voorkeure"
+msgstr "Voorkeure is gestoor."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2051,14 +2080,13 @@ msgstr "Dit is die verkeerde IM-adres."
 #: actions/imsettings.php:397
 #, fuzzy
 msgid "Couldn't delete IM confirmation."
-msgstr ""
-"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
 #, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Bevestiging gekanselleer."
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2070,17 +2098,17 @@ msgstr "Dit is nie u Jabber-ID nie."
 #: actions/imsettings.php:447
 #, fuzzy
 msgid "The IM address was removed."
-msgstr "Die adres is verwyder."
+msgstr "Inkomende e-posadres is verwyder."
 
 #: actions/inbox.php:59
-#, php-format
+#, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr ""
+msgstr "%1$s, bladsy %2$d"
 
 #: actions/inbox.php:62
-#, php-format
+#, fuzzy, php-format
 msgid "Inbox for %s"
-msgstr ""
+msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
@@ -2101,16 +2129,18 @@ msgid "Invalid email address: %s"
 msgstr "Ongeldige e-posadres: %s"
 
 #: actions/invite.php:110
+#, fuzzy
 msgid "Invitation(s) sent"
-msgstr ""
+msgstr "Uitnodigings"
 
 #: actions/invite.php:112
 msgid "Invite new users"
 msgstr "Nooi nuwe gebruikers"
 
 #: actions/invite.php:128
+#, fuzzy
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "U volg hierdie gebruiker:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2283,9 +2313,9 @@ msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
+msgstr "%1$s het die groep %2$s verlaat"
 
 #: actions/makeadmin.php:133
 #, php-format
@@ -2300,19 +2330,21 @@ msgstr ""
 #: actions/microsummary.php:69
 #, fuzzy
 msgid "No current status."
-msgstr "Geen huidige status"
+msgstr "Geen resultate nie."
 
 #: actions/newapplication.php:52
 msgid "New Application"
 msgstr "Nuwe appplikasie"
 
 #: actions/newapplication.php:64
+#, fuzzy
 msgid "You must be logged in to register an application."
-msgstr ""
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 
 #: actions/newapplication.php:143
+#, fuzzy
 msgid "Use this form to register a new application."
-msgstr ""
+msgstr "Gebruik die vorm om u applikasie te wysig."
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
@@ -2327,8 +2359,9 @@ msgid "New group"
 msgstr "Nuwe groep"
 
 #: actions/newgroup.php:110
+#, fuzzy
 msgid "Use this form to create a new group."
-msgstr ""
+msgstr "Gebruik hierdie vorm om die groep te wysig."
 
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
@@ -2357,21 +2390,23 @@ msgid "Message sent"
 msgstr "Boodskap is gestuur."
 
 #: actions/newmessage.php:185
-#, php-format
+#, fuzzy, php-format
 msgid "Direct message to %s sent."
-msgstr ""
+msgstr "Direkte boodskappe aan %s"
 
 #: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-fout"
 
 #: actions/newnotice.php:69
+#, fuzzy
 msgid "New notice"
-msgstr ""
+msgstr "Geen kennisgewing."
 
 #: actions/newnotice.php:217
+#, fuzzy
 msgid "Notice posted"
-msgstr ""
+msgstr "Hierdie kennisgewing is verwyder."
 
 #: actions/noticesearch.php:68
 #, php-format
@@ -2385,9 +2420,9 @@ msgid "Text search"
 msgstr "Teks soektog"
 
 #: actions/noticesearch.php:91
-#, php-format
+#, fuzzy, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2409,9 +2444,9 @@ msgid "Updates with \"%s\""
 msgstr "Opdaterings met \"%s\""
 
 #: actions/noticesearchrss.php:98
-#, php-format
+#, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/nudge.php:85
 msgid ""
@@ -2427,33 +2462,37 @@ msgid "Nudge sent!"
 msgstr "Die por is gestuur!"
 
 #: actions/oauthappssettings.php:59
+#, fuzzy
 msgid "You must be logged in to list your applications."
-msgstr ""
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 
 #: actions/oauthappssettings.php:74
+#, fuzzy
 msgid "OAuth applications"
-msgstr ""
+msgstr "Die applikasie bestaan nie."
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #: actions/oauthappssettings.php:135
-#, php-format
+#, fuzzy, php-format
 msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "Dit was nie moontlik om die applikasie te skep nie."
 
 #: actions/oauthconnectionssettings.php:72
+#, fuzzy
 msgid "Connected applications"
-msgstr ""
+msgstr "Skrap applikasie"
 
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
+#, fuzzy
 msgid "You are not a user of that application."
-msgstr ""
+msgstr "U is nie die eienaar van hierdie applikasie nie."
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
@@ -2493,20 +2532,23 @@ msgstr ""
 #. TRANS: Client error on an API request with an unsupported data format.
 #: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
 #: lib/apiaction.php:1232 lib/apiaction.php:1355
+#, fuzzy
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Nie-ondersteunde formaat."
 
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mense soek"
 
 #: actions/opensearch.php:67
+#, fuzzy
 msgid "Notice Search"
-msgstr ""
+msgstr "Mense soek"
 
 #: actions/othersettings.php:60
+#, fuzzy
 msgid "Other settings"
-msgstr ""
+msgstr "Avatar-instellings"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2525,46 +2567,52 @@ msgid "Automatic shortening service to use."
 msgstr ""
 
 #: actions/othersettings.php:122
+#, fuzzy
 msgid "View profile designs"
-msgstr ""
+msgstr "Wysig profiel-instellings"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
 #: actions/othersettings.php:153
+#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
+msgstr "Ligging is te lank is (maksimum 255 karakters)."
 
 #: actions/otp.php:69
+#, fuzzy
 msgid "No user ID specified."
-msgstr ""
+msgstr "Geen groep verskaf nie."
 
 #: actions/otp.php:83
+#, fuzzy
 msgid "No login token specified."
-msgstr ""
+msgstr "Geen profiel verskaf nie."
 
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
 #: actions/otp.php:95
+#, fuzzy
 msgid "Invalid login token specified."
-msgstr ""
+msgstr "Ongeldige token."
 
 #: actions/otp.php:104
+#, fuzzy
 msgid "Login token expired."
-msgstr ""
+msgstr "Teken aan"
 
 #: actions/outbox.php:58
-#, php-format
+#, fuzzy, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr ""
+msgstr "%1$s, bladsy %2$d"
 
 #: actions/outbox.php:61
-#, php-format
+#, fuzzy, php-format
 msgid "Outbox for %s"
-msgstr ""
+msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
@@ -2643,7 +2691,7 @@ msgstr ""
 #: actions/pathsadminpanel.php:157
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Tema is nie beskikbaar nie: %s"
+msgstr "Tema-gids"
 
 #: actions/pathsadminpanel.php:163
 #, fuzzy, php-format
@@ -2681,8 +2729,9 @@ msgid "Path"
 msgstr "Pad"
 
 #: actions/pathsadminpanel.php:242
+#, fuzzy
 msgid "Site path"
-msgstr ""
+msgstr "Werf se tema"
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
@@ -2781,8 +2830,9 @@ msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
+#, fuzzy
 msgid "Save paths"
-msgstr ""
+msgstr "Tema-pad"
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2816,8 +2866,9 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #: actions/profilesettings.php:60
+#, fuzzy
 msgid "Profile settings"
-msgstr ""
+msgstr "Wysig profiel-instellings"
 
 #: actions/profilesettings.php:71
 msgid ""
@@ -2829,8 +2880,11 @@ msgid "Profile information"
 msgstr ""
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
+#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr ""
+"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
+"spasies bevat nie."
 
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
@@ -2909,17 +2963,18 @@ msgid ""
 msgstr ""
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
+#, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr ""
+msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #: actions/profilesettings.php:241
+#, fuzzy
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "Die naam is te lank (maksimum 255 karakters)."
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
@@ -2927,20 +2982,24 @@ msgid "Invalid tag: \"%s\""
 msgstr "Ongeldige etiket: \"$s\""
 
 #: actions/profilesettings.php:306
+#, fuzzy
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "Kon nie gebruikersdata opdateer nie."
 
 #: actions/profilesettings.php:363
+#, fuzzy
 msgid "Couldn't save location prefs."
-msgstr ""
+msgstr "Dit was nie moontlik om die applikasie by te werk nie."
 
 #: actions/profilesettings.php:375
+#, fuzzy
 msgid "Couldn't save profile."
-msgstr ""
+msgstr "Kon nie die profiel stoor nie."
 
 #: actions/profilesettings.php:383
+#, fuzzy
 msgid "Couldn't save tags."
-msgstr ""
+msgstr "Kon nie gebruiker opdateer nie."
 
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
@@ -2953,17 +3012,19 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #: actions/public.php:92
+#, fuzzy
 msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #: actions/public.php:130
-#, php-format
+#, fuzzy, php-format
 msgid "Public timeline, page %d"
-msgstr ""
+msgstr "Populêre kennisgewings, bladsy %d"
 
 #: actions/public.php:132 lib/publicgroupnav.php:79
+#, fuzzy
 msgid "Public timeline"
-msgstr ""
+msgstr "%s tydlyn"
 
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
@@ -2978,11 +3039,13 @@ msgid "Public Stream Feed (Atom)"
 msgstr ""
 
 #: actions/public.php:188
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
 
 #: actions/public.php:191
 msgid "Be the first to post!"
@@ -3026,8 +3089,9 @@ msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
 #: actions/publictagcloud.php:72
+#, fuzzy
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
 
 #: actions/publictagcloud.php:75
 #, php-format
@@ -3037,36 +3101,42 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:134
+#, fuzzy
 msgid "Tag cloud"
-msgstr ""
+msgstr "Verander kleure"
 
 #: actions/recoverpassword.php:36
+#, fuzzy
 msgid "You are already logged in!"
-msgstr ""
+msgstr "U is reeds aangeteken."
 
 #: actions/recoverpassword.php:62
+#, fuzzy
 msgid "No such recovery code."
-msgstr ""
+msgstr "Die kennisgewing bestaan nie."
 
 #: actions/recoverpassword.php:66
+#, fuzzy
 msgid "Not a recovery code."
-msgstr ""
+msgstr "Nie 'n geregistreerde gebruiker nie."
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
 
 #: actions/recoverpassword.php:86
+#, fuzzy
 msgid "Error with confirmation code."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 #: actions/recoverpassword.php:111
+#, fuzzy
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "Huidige bevestigde e-posadres."
 
 #: actions/recoverpassword.php:152
 msgid ""
@@ -3079,28 +3149,33 @@ msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 #: actions/recoverpassword.php:188
+#, fuzzy
 msgid "Password recovery"
-msgstr ""
+msgstr "Verander wagwoord"
 
 #: actions/recoverpassword.php:191
+#, fuzzy
 msgid "Nickname or email address"
-msgstr ""
+msgstr "Geen e-posadres."
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#, fuzzy
 msgid "Recover"
-msgstr ""
+msgstr "Verwyder"
 
 #: actions/recoverpassword.php:208
+#, fuzzy
 msgid "Reset password"
-msgstr ""
+msgstr "Nuwe wagwoord"
 
 #: actions/recoverpassword.php:209
+#, fuzzy
 msgid "Recover password"
-msgstr ""
+msgstr "Nuwe wagwoord"
 
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
@@ -3111,16 +3186,18 @@ msgid "Unknown action"
 msgstr "Onbekende aksie"
 
 #: actions/recoverpassword.php:236
+#, fuzzy
 msgid "6 or more characters, and don't forget it!"
-msgstr ""
+msgstr "6 of meer karakters"
 
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstel"
 
 #: actions/recoverpassword.php:252
+#, fuzzy
 msgid "Enter a nickname or email address."
-msgstr ""
+msgstr "Dit is nie u e-posadres nie."
 
 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
@@ -3131,8 +3208,9 @@ msgid "No registered email address for that user."
 msgstr ""
 
 #: actions/recoverpassword.php:313
+#, fuzzy
 msgid "Error saving address confirmation."
-msgstr ""
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #: actions/recoverpassword.php:338
 msgid ""
@@ -3141,20 +3219,24 @@ msgid ""
 msgstr ""
 
 #: actions/recoverpassword.php:357
+#, fuzzy
 msgid "Unexpected password reset."
-msgstr ""
+msgstr "Die vorm is onverwags ingestuur."
 
 #: actions/recoverpassword.php:365
+#, fuzzy
 msgid "Password must be 6 chars or more."
-msgstr ""
+msgstr "Wagwoord moet 6 of meer karakters bevat."
 
 #: actions/recoverpassword.php:369
+#, fuzzy
 msgid "Password and confirmation do not match."
-msgstr ""
+msgstr "Wagwoorde is nie dieselfde nie."
 
 #: actions/recoverpassword.php:388 actions/register.php:255
+#, fuzzy
 msgid "Error setting user."
-msgstr ""
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
@@ -3203,12 +3285,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
 #: actions/register.php:437
+#, fuzzy
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6 of meer karakters"
 
 #: actions/register.php:441
+#, fuzzy
 msgid "Same as password above. Required."
-msgstr ""
+msgstr "Dieselfde as wagwoord hierbo"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -3295,16 +3379,18 @@ msgid "Subscribe to a remote user"
 msgstr ""
 
 #: actions/remotesubscribe.php:129
+#, fuzzy
 msgid "User nickname"
-msgstr ""
+msgstr "Geen gebruikersnaam nie."
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
 #: actions/remotesubscribe.php:133
+#, fuzzy
 msgid "Profile URL"
-msgstr ""
+msgstr "Profiel"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
@@ -3336,18 +3422,21 @@ msgid "Only logged-in users can repeat notices."
 msgstr ""
 
 #: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
 msgid "No notice specified."
-msgstr ""
+msgstr "Geen profiel verskaf nie."
 
 #: actions/repeat.php:76
+#, fuzzy
 msgid "You can't repeat your own notice."
-msgstr ""
+msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #: actions/repeat.php:90
+#, fuzzy
 msgid "You already repeated that notice."
-msgstr ""
+msgstr "U het reeds die kennisgewing herhaal."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Herhalend"
 
@@ -3357,29 +3446,29 @@ msgstr "Herhaal!"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
-#, php-format
+#, fuzzy, php-format
 msgid "Replies to %s"
-msgstr ""
+msgstr "Herhalings van %s"
 
 #: actions/replies.php:128
-#, php-format
+#, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, bladsy %2$d"
 
 #: actions/replies.php:145
-#, php-format
+#, fuzzy, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/replies.php:152
-#, php-format
+#, fuzzy, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #: actions/replies.php:159
-#, php-format
+#, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr ""
+msgstr "Voer vir vriende van %s (Atom)"
 
 #: actions/replies.php:199
 #, fuzzy, php-format
@@ -3405,13 +3494,14 @@ msgid ""
 msgstr ""
 
 #: actions/repliesrss.php:72
-#, php-format
+#, fuzzy, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/revokerole.php:75
+#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
@@ -3422,12 +3512,14 @@ msgid "StatusNet"
 msgstr "StatusNet"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #: actions/sandbox.php:72
+#, fuzzy
 msgid "User is already sandboxed."
-msgstr ""
+msgstr "Hierdie gebruiker is reeds stilgemaak."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3440,8 +3532,9 @@ msgid "Session settings for this StatusNet site."
 msgstr ""
 
 #: actions/sessionsadminpanel.php:175
+#, fuzzy
 msgid "Handle sessions"
-msgstr ""
+msgstr "Sessies"
 
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
@@ -3457,16 +3550,19 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
+#, fuzzy
 msgid "Save site settings"
-msgstr ""
+msgstr "Stoor toegangsinstellings"
 
 #: actions/showapplication.php:82
+#, fuzzy
 msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
 
 #: actions/showapplication.php:157
+#, fuzzy
 msgid "Application profile"
-msgstr ""
+msgstr "Die applikasie is nie gevind nie."
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3501,16 +3597,18 @@ msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 #: actions/showapplication.php:213
+#, fuzzy
 msgid "Application actions"
-msgstr ""
+msgstr "Die applikasie is nie gevind nie."
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
+#, fuzzy
 msgid "Application info"
-msgstr ""
+msgstr "Die applikasie is nie gevind nie."
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3529,8 +3627,9 @@ msgid "Access token URL"
 msgstr ""
 
 #: actions/showapplication.php:283
+#, fuzzy
 msgid "Authorize URL"
-msgstr ""
+msgstr "Outeur"
 
 #: actions/showapplication.php:288
 msgid ""
@@ -3539,32 +3638,34 @@ msgid ""
 msgstr ""
 
 #: actions/showapplication.php:309
+#, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr ""
+msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
 
 #: actions/showfavorites.php:79
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
+msgstr "%s se gunsteling kennisgewings"
 
 #: actions/showfavorites.php:132
+#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 
 #: actions/showfavorites.php:171
-#, php-format
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/showfavorites.php:178
-#, php-format
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #: actions/showfavorites.php:185
-#, php-format
+#, fuzzy, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr ""
+msgstr "Voer vir vriende van %s (Atom)"
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3624,19 +3725,19 @@ msgid "Group actions"
 msgstr "Groepsaksies"
 
 #: actions/showgroup.php:338
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/showgroup.php:344
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #: actions/showgroup.php:350
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr ""
+msgstr "Voer vir vriende van %s (Atom)"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3693,14 +3794,14 @@ msgid "Only the sender and recipient may read this message."
 msgstr ""
 
 #: actions/showmessage.php:108
-#, php-format
+#, fuzzy, php-format
 msgid "Message to %1$s on %2$s"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/showmessage.php:113
-#, php-format
+#, fuzzy, php-format
 msgid "Message from %1$s on %2$s"
-msgstr ""
+msgstr "Opdaterings van %1$s op %2$s."
 
 #: actions/shownotice.php:90
 msgid "Notice deleted."
@@ -3717,24 +3818,24 @@ msgid "%1$s, page %2$d"
 msgstr "%1$s, bladsy %2$d"
 
 #: actions/showstream.php:122
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgstr "Voer vir vriende van %s (Atom)"
 
 #: actions/showstream.php:148
 #, php-format
@@ -3742,9 +3843,11 @@ msgid "FOAF for %s"
 msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
 #: actions/showstream.php:200
-#, php-format
+#, fuzzy, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr ""
+"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
+"nie."
 
 #: actions/showstream.php:205
 msgid ""
@@ -3798,8 +3901,9 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
+#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "Nie 'n geldige e-posadres nie."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -3819,8 +3923,9 @@ msgid "General"
 msgstr "Algemeen"
 
 #: actions/siteadminpanel.php:224
+#, fuzzy
 msgid "Site name"
-msgstr ""
+msgstr "Werf se tema"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -3843,8 +3948,9 @@ msgid "URL used for credits link in footer of each page"
 msgstr ""
 
 #: actions/siteadminpanel.php:239
+#, fuzzy
 msgid "Contact email address for your site"
-msgstr ""
+msgstr "Inkomende e-posadres is verwyder."
 
 #: actions/siteadminpanel.php:245
 msgid "Local"
@@ -3859,8 +3965,9 @@ msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 #: actions/siteadminpanel.php:262
+#, fuzzy
 msgid "Default language"
-msgstr ""
+msgstr "Standaardtydsone"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -3887,32 +3994,37 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
+#, fuzzy
 msgid "Site Notice"
-msgstr ""
+msgstr "Kennisgewings"
 
 #: actions/sitenoticeadminpanel.php:67
+#, fuzzy
 msgid "Edit site-wide message"
-msgstr ""
+msgstr "Nuwe boodskap"
 
 #: actions/sitenoticeadminpanel.php:103
+#, fuzzy
 msgid "Unable to save site notice."
-msgstr ""
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:176
+#, fuzzy
 msgid "Site notice text"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
+#, fuzzy
 msgid "Save site notice"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
@@ -3928,8 +4040,9 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
+#, fuzzy
 msgid "SMS is not available."
-msgstr ""
+msgstr "IM is nie beskikbaar nie."
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
@@ -3939,8 +4052,9 @@ msgstr "IP-adres"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
+#, fuzzy
 msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
+msgstr "Huidige bevestigde e-posadres."
 
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
@@ -3949,8 +4063,9 @@ msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:142
+#, fuzzy
 msgid "Confirmation code"
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
@@ -3978,7 +4093,7 @@ msgstr ""
 #: actions/smssettings.php:195
 #, fuzzy
 msgid "SMS preferences"
-msgstr "Voorkeure"
+msgstr "Voorkeure is gestoor."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4000,18 +4115,21 @@ msgstr "Geen telefoonnommer."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
+#, fuzzy
 msgid "No carrier selected."
-msgstr ""
+msgstr "Hierdie kennisgewing is verwyder."
 
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
+#, fuzzy
 msgid "That is already your phone number."
-msgstr ""
+msgstr "Dit is al reeds u Jabber-ID."
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:356
+#, fuzzy
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
@@ -4022,20 +4140,22 @@ msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
+#, fuzzy
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "Dit is die verkeerde IM-adres."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 #, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Bevestiging gekanselleer."
+msgstr "SMS-bevestiging"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
 #: actions/smssettings.php:448
+#, fuzzy
 msgid "That is not your phone number."
-msgstr ""
+msgstr "Dit is nie u Jabber-ID nie."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
@@ -4064,8 +4184,9 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:548
+#, fuzzy
 msgid "No code entered"
-msgstr ""
+msgstr "Geen inhoud nie!"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -4078,16 +4199,18 @@ msgid "Manage snapshot configuration"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:127
+#, fuzzy
 msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Ongeldige rol."
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
+#, fuzzy
 msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "Die logo-URL is ongeldig."
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
@@ -4122,25 +4245,29 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
+#, fuzzy
 msgid "Save snapshot settings"
-msgstr ""
+msgstr "Stoor toegangsinstellings"
 
 #: actions/subedit.php:70
+#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "U volg hierdie gebruiker:"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
+#, fuzzy
 msgid "Could not save subscription."
-msgstr ""
+msgstr "Kon nie die profiel stoor nie."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
 #: actions/subscribe.php:107
+#, fuzzy
 msgid "No such profile."
-msgstr ""
+msgstr "Die lêer bestaan nie."
 
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
@@ -4156,9 +4283,9 @@ msgid "%s subscribers"
 msgstr ""
 
 #: actions/subscribers.php:52
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr ""
+msgstr "%1$s en vriende, bladsy %2$d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4188,14 +4315,14 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:52
-#, php-format
+#, fuzzy, php-format
 msgid "%s subscriptions"
-msgstr ""
+msgstr "Beskrywing"
 
 #: actions/subscriptions.php:54
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr ""
+msgstr "%1$s groepe, bladsy %2$d"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4230,24 +4357,24 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, php-format
+#, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
+msgstr "%1$s, bladsy %2$d"
 
 #: actions/tag.php:87
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 1.0)"
 
 #: actions/tag.php:93
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
+msgstr "Voer vir vriende van %s (RSS 2.0)"
 
 #: actions/tag.php:99
-#, php-format
+#, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgstr "Voer vir vriende van %s (Atom)"
 
 #: actions/tagother.php:39
 msgid "No ID argument."
@@ -4283,28 +4410,33 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
+#, fuzzy
 msgid "Could not save tags."
-msgstr ""
+msgstr "Kon nie die profiel stoor nie."
 
 #: actions/tagother.php:236
+#, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "Gebruik die vorm om u applikasie te wysig."
 
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekende etiket."
 
 #: actions/unblock.php:59
+#, fuzzy
 msgid "You haven't blocked that user."
-msgstr ""
+msgstr "U het reeds die gebruiker geblokkeer."
 
 #: actions/unsandbox.php:72
+#, fuzzy
 msgid "User is not sandboxed."
-msgstr ""
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #: actions/unsilence.php:72
+#, fuzzy
 msgid "User is not silenced."
-msgstr ""
+msgstr "Hierdie gebruiker is reeds stilgemaak."
 
 #: actions/unsubscribe.php:77
 #, fuzzy
@@ -4363,36 +4495,42 @@ msgid "New users"
 msgstr "Nuwe gebruikers"
 
 #: actions/useradminpanel.php:235
+#, fuzzy
 msgid "New user welcome"
-msgstr ""
+msgstr "Nuwe gebruikers"
 
 #: actions/useradminpanel.php:236
+#, fuzzy
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Die naam is te lank (maksimum 255 karakters)."
 
 #: actions/useradminpanel.php:241
+#, fuzzy
 msgid "Default subscription"
-msgstr ""
+msgstr "Beskrywing"
 
 #: actions/useradminpanel.php:242
+#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Uitnodigings"
 
 #: actions/useradminpanel.php:256
+#, fuzzy
 msgid "Invitations enabled"
-msgstr ""
+msgstr "Uitnodigings"
 
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
 #: actions/userauthorization.php:105
+#, fuzzy
 msgid "Authorize subscription"
-msgstr ""
+msgstr "Beskrywing"
 
 #: actions/userauthorization.php:110
 msgid ""
@@ -4411,16 +4549,18 @@ msgstr "Aanvaar"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
+#, fuzzy
 msgid "Subscribe to this user"
-msgstr ""
+msgstr "U volg hierdie gebruiker:"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Verwerp"
 
 #: actions/userauthorization.php:220
+#, fuzzy
 msgid "Reject this subscription"
-msgstr ""
+msgstr "Verwyder die gebruiker"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4438,8 +4578,9 @@ msgid ""
 msgstr ""
 
 #: actions/userauthorization.php:266
+#, fuzzy
 msgid "Subscription rejected"
-msgstr ""
+msgstr "Beskrywing word vereis."
 
 #: actions/userauthorization.php:268
 msgid ""
@@ -4469,9 +4610,9 @@ msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
 #: actions/userauthorization.php:345
-#, php-format
+#, fuzzy, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "Die \"callback\"-URL is nie geldig nie."
 
 #: actions/userauthorization.php:350
 #, php-format
@@ -4479,13 +4620,14 @@ msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan nie die avatar-URL \"%s\" lees nie."
 
 #: actions/userauthorization.php:355
-#, php-format
+#, fuzzy, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Kan nie die avatar-URL \"%s\" lees nie."
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
 msgid "Profile design"
-msgstr ""
+msgstr "Profiel"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4508,9 +4650,9 @@ msgid "Search for more groups"
 msgstr "Soek vir meer groepe"
 
 #: actions/usergroups.php:159
-#, php-format
+#, fuzzy, php-format
 msgid "%s is not a member of any group."
-msgstr ""
+msgstr "U is nie 'n lid van enige groep nie."
 
 #: actions/usergroups.php:164
 #, php-format
@@ -4622,8 +4764,9 @@ msgstr "Ongeldige grootte."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
+#, fuzzy
 msgid "Group join failed."
-msgstr ""
+msgstr "Groepsprofiel"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
@@ -4632,20 +4775,22 @@ msgstr "Nie lid van die groep nie."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
+#, fuzzy
 msgid "Group leave failed."
-msgstr ""
+msgstr "Groepsprofiel"
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
+#, fuzzy
 msgid "Could not update local group."
-msgstr ""
+msgstr "Dit was nie moontlik om die groep by te werk nie."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, php-format
+#, fuzzy, php-format
 msgid "Could not create login token for %s"
-msgstr ""
+msgstr "Dit was nie moontlik om die aliasse te skep nie."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -4654,18 +4799,21 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
+#, fuzzy
 msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "U inkomende boodskappe"
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
+#, fuzzy
 msgid "Could not insert message."
-msgstr ""
+msgstr "Kan nie boodskap verwerk nie."
 
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:74
+#, fuzzy
 msgid "Could not update message with new URI."
-msgstr ""
+msgstr "Kan nie boodskap verwerk nie."
 
 #. 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).
@@ -4705,8 +4853,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 #: classes/Notice.php:286
+#, fuzzy
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -4726,7 +4875,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4769,8 +4918,9 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
+#, fuzzy
 msgid "User has blocked you."
-msgstr ""
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
@@ -4812,18 +4962,21 @@ msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
+#, fuzzy
 msgid "Could not set group URI."
-msgstr ""
+msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
+#, fuzzy
 msgid "Could not set group membership."
-msgstr ""
+msgstr "Kon nie die groep skep nie."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
+#, fuzzy
 msgid "Could not save local group info."
-msgstr ""
+msgstr "Kon nie die profiel stoor nie."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -4832,8 +4985,9 @@ msgstr "Verander u profiel gegewens"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:116
+#, fuzzy
 msgid "Upload an avatar"
-msgstr ""
+msgstr "Die opdatering van die avatar het gefaal."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
@@ -4890,9 +5044,10 @@ msgstr "Persoonlik"
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
+#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr ""
+msgstr "Verander u wagwoord"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
@@ -4932,9 +5087,10 @@ msgstr "Uitnodig"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
+#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr ""
+msgstr "Meld by die webwerf aan"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
@@ -4990,18 +5146,21 @@ msgstr "Soek"
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 #: lib/action.php:525 lib/adminpanelaction.php:400
+#, fuzzy
 msgid "Site notice"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
+#, fuzzy
 msgid "Local views"
-msgstr ""
+msgstr "Lokaal"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 #: lib/action.php:659
+#, fuzzy
 msgid "Page notice"
-msgstr ""
+msgstr "Populêre kennisgewings"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
@@ -5044,8 +5203,9 @@ msgid "Contact"
 msgstr "Kontak"
 
 #: lib/action.php:794
+#, fuzzy
 msgid "Badge"
-msgstr ""
+msgstr "Aanpor"
 
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
@@ -5107,8 +5267,9 @@ msgstr ""
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #: lib/action.php:1192
+#, fuzzy
 msgid "Pagination"
-msgstr ""
+msgstr "Registratie"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
@@ -5141,13 +5302,15 @@ msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 #: lib/adminpanelaction.php:98
+#, fuzzy
 msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
+#, fuzzy
 msgid "Changes to that panel are not allowed."
-msgstr ""
+msgstr "Registrasie nie toegelaat nie."
 
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
@@ -5162,13 +5325,15 @@ msgstr ""
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
+#, fuzzy
 msgid "Unable to delete design setting."
-msgstr ""
+msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
+#, fuzzy
 msgid "Basic site configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
@@ -5178,8 +5343,9 @@ msgstr "Webtuiste"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
+#, fuzzy
 msgid "Design configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
@@ -5189,8 +5355,9 @@ msgstr "Ontwerp"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
+#, fuzzy
 msgid "User configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5199,28 +5366,33 @@ msgstr "Gebruiker"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
+#, fuzzy
 msgid "Access configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
+#, fuzzy
 msgid "Paths configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
+#, fuzzy
 msgid "Sessions configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
+#, fuzzy
 msgid "Edit site notice"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
+#, fuzzy
 msgid "Snapshots configuration"
-msgstr ""
+msgstr "SMS-bevestiging"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
@@ -5229,13 +5401,15 @@ msgstr ""
 
 #. TRANS: Form legend.
 #: lib/applicationeditform.php:137
+#, fuzzy
 msgid "Edit application"
-msgstr ""
+msgstr "Wysig applikasie"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:187
+#, fuzzy
 msgid "Icon for this application"
-msgstr ""
+msgstr "Moenie die applikasie verwyder nie"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
@@ -5245,23 +5419,27 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
+#, fuzzy
 msgid "Describe your application"
-msgstr ""
+msgstr "Skrap applikasie"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
+#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "U is nie die eienaar van hierdie applikasie nie."
 
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
+#, fuzzy
 msgid "Source URL"
-msgstr ""
+msgstr "Bron"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
+#, fuzzy
 msgid "Organization responsible for this application"
-msgstr ""
+msgstr "U is nie die eienaar van hierdie applikasie nie."
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
@@ -5331,7 +5509,7 @@ msgstr ""
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Herroep"
+msgstr "Verwyder"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5349,8 +5527,9 @@ msgid "Provider"
 msgstr "Verskaffer"
 
 #: lib/attachmentnoticesection.php:67
+#, fuzzy
 msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "Etikette vir hierdie aanhangsel"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
@@ -5373,16 +5552,18 @@ msgid "Command complete"
 msgstr "Opdrag voltooi"
 
 #: lib/channel.php:240
+#, fuzzy
 msgid "Command failed"
-msgstr ""
+msgstr "Opdrag voltooi"
 
 #: lib/command.php:83 lib/command.php:105
 msgid "Notice with that id does not exist"
 msgstr ""
 
 #: lib/command.php:99 lib/command.php:596
+#, fuzzy
 msgid "User has no last notice"
-msgstr ""
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
@@ -5409,9 +5590,9 @@ msgstr ""
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 #: lib/command.php:234
-#, php-format
+#, fuzzy, php-format
 msgid "Nudge sent to %s"
-msgstr ""
+msgstr "Die por is gestuur"
 
 #: lib/command.php:260
 #, php-format
@@ -5426,22 +5607,23 @@ msgid "Notice marked as fave."
 msgstr ""
 
 #: lib/command.php:323
+#, fuzzy
 msgid "You are already a member of that group"
-msgstr ""
+msgstr "U is reeds 'n lid van die groep."
 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: lib/command.php:339
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %1$s to group %2$s"
-msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
+msgstr ""
 
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kon nie die groep skep nie."
+msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:418
@@ -5488,46 +5670,52 @@ msgstr ""
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 #: lib/command.php:492
-#, php-format
+#, fuzzy, php-format
 msgid "Direct message to %s sent"
-msgstr ""
+msgstr "Direkte boodskappe aan %s"
 
 #: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
 #: lib/command.php:514
+#, fuzzy
 msgid "Cannot repeat your own notice"
-msgstr ""
+msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #: lib/command.php:519
+#, fuzzy
 msgid "Already repeated that notice"
-msgstr ""
+msgstr "U het reeds die kennisgewing herhaal."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #: lib/command.php:529
-#, php-format
+#, fuzzy, php-format
 msgid "Notice from %s repeated"
-msgstr ""
+msgstr "Hierdie kennisgewing is verwyder."
 
 #: lib/command.php:531
+#, fuzzy
 msgid "Error repeating notice."
-msgstr ""
+msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #: lib/command.php:562
-#, php-format
+#, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
 
 #: lib/command.php:571
-#, php-format
+#, fuzzy, php-format
 msgid "Reply to %s sent"
-msgstr ""
+msgstr "Na %s herhaal"
 
 #: lib/command.php:573
+#, fuzzy
 msgid "Error saving notice."
-msgstr ""
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
@@ -5552,24 +5740,28 @@ msgid "Unsubscribed from %s"
 msgstr ""
 
 #: lib/command.php:682 lib/command.php:705
+#, fuzzy
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "Opdrag voltooi"
 
 #: lib/command.php:685
+#, fuzzy
 msgid "Notification off."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
 #: lib/command.php:708
+#, fuzzy
 msgid "Notification on."
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #: lib/command.php:710
+#, fuzzy
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "U kan nie u eie kennisgewings herhaal nie."
 
 #: lib/command.php:723
 msgid "Login command is disabled"
@@ -5586,8 +5778,9 @@ msgid "Unsubscribed  %s"
 msgstr ""
 
 #: lib/command.php:778
+#, fuzzy
 msgid "You are not subscribed to anyone."
-msgstr ""
+msgstr "U volg hierdie gebruiker:"
 
 #: lib/command.php:780
 msgid "You are subscribed to this person:"
@@ -5596,8 +5789,9 @@ msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 
 #: lib/command.php:800
+#, fuzzy
 msgid "No one is subscribed to you."
-msgstr ""
+msgstr "Hierdie gebruiker volg u:"
 
 #: lib/command.php:802
 msgid "This person is subscribed to you:"
@@ -5658,8 +5852,9 @@ msgid ""
 msgstr ""
 
 #: lib/common.php:135
+#, fuzzy
 msgid "No configuration file found. "
-msgstr ""
+msgstr "Geen bevestigingskode."
 
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
@@ -5686,20 +5881,23 @@ msgid "Updates by SMS"
 msgstr ""
 
 #: lib/connectsettingsaction.php:120
+#, fuzzy
 msgid "Connections"
-msgstr ""
+msgstr "Konnekteer"
 
 #: lib/connectsettingsaction.php:121
+#, fuzzy
 msgid "Authorized connected applications"
-msgstr ""
+msgstr "Skrap applikasie"
 
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Databasisfout"
 
 #: lib/designsettings.php:105
+#, fuzzy
 msgid "Upload file"
-msgstr ""
+msgstr "Oplaai"
 
 #: lib/designsettings.php:109
 msgid ""
@@ -5711,16 +5909,19 @@ msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
 msgid "Disfavor this notice"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
 
 #: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
 msgid "Favor this notice"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
 
 #: lib/favorform.php:140
+#, fuzzy
 msgid "Favor"
-msgstr ""
+msgstr "Gunstelinge"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
@@ -5808,9 +6009,9 @@ msgid "%s blocked users"
 msgstr "%s geblokkeerde gebruikers"
 
 #: lib/groupnav.php:108
-#, php-format
+#, fuzzy, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Groep %s wysig"
 
 #: lib/groupnav.php:113
 msgid "Logo"
@@ -5827,8 +6028,9 @@ msgid "Add or edit %s design"
 msgstr ""
 
 #: lib/groupsbymemberssection.php:71
+#, fuzzy
 msgid "Groups with most members"
-msgstr ""
+msgstr "Groepe waarvan %s lid is"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
@@ -5845,17 +6047,19 @@ msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: lib/imagefile.php:72
+#, fuzzy
 msgid "Unsupported image file format."
-msgstr ""
+msgstr "Nie-ondersteunde formaat."
 
 #: lib/imagefile.php:88
-#, php-format
+#, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 
 #: lib/imagefile.php:93
+#, fuzzy
 msgid "Partial upload."
-msgstr ""
+msgstr "Geen lêer opgelaai nie."
 
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
@@ -5866,8 +6070,9 @@ msgid "Not an image or corrupt file."
 msgstr ""
 
 #: lib/imagefile.php:122
+#, fuzzy
 msgid "Lost our file."
-msgstr ""
+msgstr "Die lêer bestaan nie."
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -5887,9 +6092,9 @@ msgid "[%s]"
 msgstr "[%s]"
 
 #: lib/jabber.php:567
-#, php-format
+#, fuzzy, php-format
 msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "Onbekende taal \"%s\"."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -5900,8 +6105,9 @@ msgid "Leave"
 msgstr "Verlaat"
 
 #: lib/logingroupnav.php:80
+#, fuzzy
 msgid "Login with a username and password"
-msgstr ""
+msgstr "Ongeldige gebruikersnaam of wagwoord."
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
@@ -5909,8 +6115,9 @@ msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
+#, fuzzy
 msgid "Email address confirmation"
-msgstr ""
+msgstr "E-posadres"
 
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
@@ -5932,9 +6139,9 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "%s volg niemand nie."
 
 #: lib/mail.php:248
 #, php-format
@@ -6053,9 +6260,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, php-format
+#, fuzzy, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
+msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6131,7 +6338,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "van"
 
@@ -6152,9 +6359,9 @@ msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 
 #: lib/mailhandler.php:228
-#, php-format
+#, fuzzy, php-format
 msgid "Unsupported message type: %s"
-msgstr ""
+msgstr "Nie-ondersteunde formaat."
 
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
@@ -6195,8 +6402,10 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
+#, fuzzy
 msgid "Could not determine file's MIME type."
 msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6209,8 +6418,9 @@ msgid "%s is not a supported file type on this server."
 msgstr ""
 
 #: lib/messageform.php:120
+#, fuzzy
 msgid "Send a direct notice"
-msgstr ""
+msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 
 #: lib/messageform.php:146
 msgid "To"
@@ -6226,8 +6436,9 @@ msgid "Send"
 msgstr "Stuur"
 
 #: lib/noticeform.php:160
+#, fuzzy
 msgid "Send a notice"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #: lib/noticeform.php:173
 #, php-format
@@ -6247,8 +6458,9 @@ msgid "Share my location"
 msgstr ""
 
 #: lib/noticeform.php:215
+#, fuzzy
 msgid "Do not share my location"
-msgstr ""
+msgstr "Moenie die applikasie verwyder nie"
 
 #: lib/noticeform.php:216
 msgid ""
@@ -6285,45 +6497,50 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "in konteks"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Herhaal deur"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
+#, fuzzy
 msgid "Reply to this notice"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Antwoord"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
+#, fuzzy
 msgid "Notice repeated"
-msgstr ""
+msgstr "Hierdie kennisgewing is verwyder."
 
 #: lib/nudgeform.php:116
+#, fuzzy
 msgid "Nudge this user"
-msgstr ""
+msgstr "Verwyder die gebruiker"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Aanpor"
 
 #: lib/nudgeform.php:128
+#, fuzzy
 msgid "Send a nudge to this user"
-msgstr ""
+msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
 
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr ""
 
 #: lib/oauthstore.php:291
+#, fuzzy
 msgid "Error inserting avatar"
-msgstr ""
+msgstr "Fout tydens stoor van gebruiker; ongeldig."
 
 #: lib/oauthstore.php:306
 msgid "Error updating remote profile"
@@ -6334,12 +6551,14 @@ msgid "Error inserting remote profile"
 msgstr ""
 
 #: lib/oauthstore.php:345
+#, fuzzy
 msgid "Duplicate notice"
-msgstr ""
+msgstr "Verwyder kennisgewing"
 
 #: lib/oauthstore.php:490
+#, fuzzy
 msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #: lib/personalgroupnav.php:99
 msgid "Personal"
@@ -6366,8 +6585,9 @@ msgid "Outbox"
 msgstr ""
 
 #: lib/personalgroupnav.php:131
+#, fuzzy
 msgid "Your sent messages"
-msgstr ""
+msgstr "U inkomende boodskappe"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
@@ -6379,20 +6599,23 @@ msgid "Unknown"
 msgstr "Onbekend"
 
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#, fuzzy
 msgid "Subscriptions"
-msgstr ""
+msgstr "Beskrywing"
 
 #: lib/profileaction.php:126
+#, fuzzy
 msgid "All subscriptions"
-msgstr ""
+msgstr "Beskrywing"
 
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
 #: lib/profileaction.php:161
+#, fuzzy
 msgid "All subscribers"
-msgstr ""
+msgstr "Alle lede"
 
 #: lib/profileaction.php:191
 msgid "User ID"
@@ -6436,25 +6659,28 @@ msgid "Popular"
 msgstr "Gewild"
 
 #: lib/redirectingaction.php:95
+#, fuzzy
 msgid "No return-to arguments."
-msgstr ""
+msgstr "Geen ID-argument."
 
 #: lib/repeatform.php:107
+#, fuzzy
 msgid "Repeat this notice?"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
 #: lib/repeatform.php:132
+#, fuzzy
 msgid "Repeat this notice"
-msgstr ""
+msgstr "Verwyder hierdie kennisgewing"
 
 #: lib/revokeroleform.php:91
-#, php-format
+#, fuzzy, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr ""
+msgstr "Blok hierdie gebruiker van hierdie groep"
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6465,12 +6691,14 @@ msgid "Sandbox"
 msgstr ""
 
 #: lib/sandboxform.php:78
+#, fuzzy
 msgid "Sandbox this user"
-msgstr ""
+msgstr "Deblokkeer hierdie gebruiker"
 
 #: lib/searchaction.php:120
+#, fuzzy
 msgid "Search site"
-msgstr ""
+msgstr "Soek"
 
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
@@ -6481,8 +6709,9 @@ msgid "Search"
 msgstr "Soek"
 
 #: lib/searchaction.php:162
+#, fuzzy
 msgid "Search help"
-msgstr ""
+msgstr "Soek"
 
 #: lib/searchgroupnav.php:80
 msgid "People"
@@ -6497,8 +6726,9 @@ msgid "Find content of notices"
 msgstr ""
 
 #: lib/searchgroupnav.php:85
+#, fuzzy
 msgid "Find groups on this site"
-msgstr ""
+msgstr "groepe op %s"
 
 #: lib/section.php:89
 msgid "Untitled section"
@@ -6517,14 +6747,14 @@ msgid "Silence this user"
 msgstr "Maak die gebruikers stil"
 
 #: lib/subgroupnav.php:83
-#, php-format
+#, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr ""
+msgstr "Hierdie gebruiker volg u:"
 
 #: lib/subgroupnav.php:91
-#, php-format
+#, fuzzy, php-format
 msgid "People subscribed to %s"
-msgstr ""
+msgstr "U volg hierdie gebruiker:"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6594,9 +6824,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Kon nie die profiel stoor nie."
+msgstr ""
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -6607,29 +6836,33 @@ msgid "Unsandbox"
 msgstr ""
 
 #: lib/unsandboxform.php:80
+#, fuzzy
 msgid "Unsandbox this user"
-msgstr ""
+msgstr "Deblokkeer hierdie gebruiker"
 
 #: lib/unsilenceform.php:67
+#, fuzzy
 msgid "Unsilence"
-msgstr ""
+msgstr "Maak stil"
 
 #: lib/unsilenceform.php:78
+#, fuzzy
 msgid "Unsilence this user"
-msgstr ""
+msgstr "Maak die gebruikers stil"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Deblokkeer hierdie gebruiker"
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
 #: lib/usernoprofileexception.php:58
-#, php-format
+#, fuzzy, php-format
 msgid "User %s (%d) has no profile record."
-msgstr ""
+msgstr "Hierdie gebruiker het nie 'n profiel nie."
 
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 2b12d7f56..e4eb8d854 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Breton
 #
 # Author@translatewiki.net: Fulup
+# Author@translatewiki.net: Gwendal
 # Author@translatewiki.net: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:10+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:11:33+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: out-statusnet\n"
@@ -149,10 +150,11 @@ msgstr "Gwazh evit mignoned %s (Atom)"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
+"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
 
 #: actions/all.php:143
 #, php-format
@@ -372,9 +374,8 @@ msgid "You cannot unfollow yourself."
 msgstr "Ne c'hallit ket chom hep ho heuliañ hoc'h-unan."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Rankout a reoc'h reiñ daou id pe lesanv."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -387,8 +388,9 @@ msgstr "Diposubl eo kavout an implijer pal."
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
+#, fuzzy
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #: actions/apigroupcreate.php:176 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
@@ -536,8 +538,9 @@ msgid "Invalid nickname / password!"
 msgstr "Lesanv / ger tremen direizh !"
 
 #: actions/apioauthauthorize.php:159
+#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr ""
+msgstr "Arabat eo dilemel ar poellad-mañ"
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
@@ -682,9 +685,9 @@ msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Hizivadennoù a veneg %2$s"
 
 #: actions/apitimelinementions.php:131
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
+msgstr "%1$s statud pennroll da %2$s / %2$s."
 
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
 #, php-format
@@ -772,7 +775,7 @@ msgid "Preview"
 msgstr "Rakwelet"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Diverkañ"
 
@@ -1046,7 +1049,7 @@ msgid "Do not delete this notice"
 msgstr "Arabat dilemel an ali-mañ"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Dilemel an ali-mañ"
 
@@ -1403,14 +1406,16 @@ msgstr "Postel o tont"
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #: actions/emailsettings.php:155 actions/smssettings.php:178
+#, fuzzy
 msgid "Send email to this address to post new notices."
-msgstr ""
+msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 #: actions/emailsettings.php:164 actions/smssettings.php:186
+#, fuzzy
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
+msgstr "Chomlec'h postel nevez evit embann e %s"
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -1426,8 +1431,9 @@ msgstr "Penndibaboù ar posteloù"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
+#, fuzzy
 msgid "Send me notices of new subscriptions through email."
-msgstr ""
+msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:186
@@ -1471,8 +1477,9 @@ msgstr "Chomlec'h postel ebet."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
+#, fuzzy
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Diposubl eo implijout an ID Jabber-mañ"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
@@ -1487,8 +1494,9 @@ msgstr "Ho postel eo dija."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:374
+#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "D'un implijer all eo an niverenn-mañ dija."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
@@ -1510,8 +1518,9 @@ msgstr ""
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #: actions/emailsettings.php:419 actions/imsettings.php:383
 #: actions/smssettings.php:408
+#, fuzzy
 msgid "No pending confirmation to cancel."
-msgstr ""
+msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
@@ -1547,13 +1556,15 @@ msgstr "Dibosupl eo hizivaat doser an implijer."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:508 actions/smssettings.php:581
+#, fuzzy
 msgid "Incoming email address removed."
-msgstr ""
+msgstr "Chomlec'h postel ebet o tont."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #: actions/emailsettings.php:532 actions/smssettings.php:605
+#, fuzzy
 msgid "New incoming email address added."
-msgstr ""
+msgstr "Chomlec'h postel ebet o tont."
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1588,11 +1599,13 @@ msgid ""
 msgstr ""
 
 #: actions/favorited.php:156
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
@@ -1607,13 +1620,14 @@ msgstr "Hizivadennoù brientek gant %1$s war %2$s !"
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
+#, fuzzy
 msgid "Featured users"
-msgstr ""
+msgstr "Diverkañ an implijer"
 
 #: actions/featured.php:71
-#, php-format
+#, fuzzy, php-format
 msgid "Featured users, page %d"
-msgstr ""
+msgstr "Strollad, pajenn %d"
 
 #: actions/featured.php:99
 #, php-format
@@ -1633,8 +1647,9 @@ msgid "No attachments."
 msgstr "N'eus restr stag ebet."
 
 #: actions/file.php:51
+#, fuzzy
 msgid "No uploaded attachments."
-msgstr ""
+msgstr "N'eus restr stag ebet."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1645,8 +1660,9 @@ msgid "User being listened to does not exist."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#, fuzzy
 msgid "You can use the local subscription!"
-msgstr ""
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
@@ -1657,8 +1673,9 @@ msgid "You are not authorized."
 msgstr "N'oc'h ket aotreet."
 
 #: actions/finishremotesubscribe.php:113
+#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr ""
+msgstr "Dibosupl eo kaout ur jedaouer reked."
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
@@ -1744,16 +1761,18 @@ msgid "Block this user from this group"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
 #: actions/groupblock.php:206
+#, fuzzy
 msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Distankañ implijer ar strollad"
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
 
 #: actions/groupdesignsettings.php:68
+#, fuzzy
 msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
 
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
@@ -1785,8 +1804,9 @@ msgid ""
 msgstr ""
 
 #: actions/grouplogo.php:365
+#, fuzzy
 msgid "Pick a square area of the image to be the logo."
-msgstr ""
+msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
 
 #: actions/grouplogo.php:399
 msgid "Logo updated."
@@ -1870,11 +1890,14 @@ msgid "Create a new group"
 msgstr "Krouiñ ur strollad nevez"
 
 #: actions/groupsearch.php:52
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
+"Klask tud e %%site.name%% dre o anv, o lec'hiadur pe o diduadennoù. "
+"Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
+"arouezenn."
 
 #: actions/groupsearch.php:58
 msgid "Group search"
@@ -1895,11 +1918,13 @@ msgstr ""
 "anezhañ](%%action.newgroup%%)."
 
 #: actions/groupsearch.php:85
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
 
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
@@ -1973,13 +1998,15 @@ msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:166
+#, fuzzy
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr ""
+msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:172
+#, fuzzy
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
+msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:179
@@ -2049,9 +2076,8 @@ msgstr "N'eo ket ho ID Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "Dilamet eo bet ar chomlec'h."
+msgstr "Ar chomlec'h IM zo bet dilamet."
 
 #: actions/inbox.php:59
 #, php-format
@@ -2118,9 +2144,10 @@ msgid ""
 msgstr ""
 
 #: actions/invite.php:162
+#, fuzzy
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
-msgstr ""
+msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
 #: actions/invite.php:187
 msgid "Email addresses"
@@ -2278,9 +2305,9 @@ msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s a zo dija merour ar strollad \"%2$s\"."
 
 #: actions/makeadmin.php:133
-#, php-format
+#, fuzzy, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
+msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s."
 
 #: actions/makeadmin.php:146
 #, php-format
@@ -2365,11 +2392,14 @@ msgid "Notice posted"
 msgstr "Ali embannet"
 
 #: actions/noticesearch.php:68
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
+"Klask tud e %%site.name%% dre o anv, o lec'hiadur pe o diduadennoù. "
+"Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
+"arouezenn."
 
 #: actions/noticesearch.php:78
 msgid "Text search"
@@ -2388,11 +2418,13 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearch.php:124
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
 
 #: actions/noticesearchrss.php:96
 #, php-format
@@ -2400,9 +2432,9 @@ msgid "Updates with \"%s\""
 msgstr "Hizivadenn gant \"%s\""
 
 #: actions/noticesearchrss.php:98
-#, php-format
+#, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
+msgstr "Hizivadennoù merket gant %1$s e %2$s !"
 
 #: actions/nudge.php:85
 msgid ""
@@ -2447,13 +2479,14 @@ msgid "You are not a user of that application."
 msgstr "N'oc'h ket un implijer eus ar poellad-mañ."
 
 #: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for app: %s."
-msgstr "Dibosupl eo nullañ moned ar poellad : "
+msgstr ""
 
 #: actions/oauthconnectionssettings.php:198
+#, fuzzy
 msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "N'o peus enrollet poellad ebet evit poent."
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
@@ -2470,9 +2503,9 @@ msgstr "Statud %1$s war %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "seurt an danvez "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2483,8 +2516,9 @@ msgstr ""
 #. TRANS: Client error on an API request with an unsupported data format.
 #: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
 #: lib/apiaction.php:1232 lib/apiaction.php:1355
+#, fuzzy
 msgid "Not a supported data format."
-msgstr ""
+msgstr "Diembreget eo ar furmad-se."
 
 #: actions/opensearch.php:64
 msgid "People Search"
@@ -2515,36 +2549,42 @@ msgid "Automatic shortening service to use."
 msgstr ""
 
 #: actions/othersettings.php:122
+#, fuzzy
 msgid "View profile designs"
-msgstr ""
+msgstr "Design ar profil"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr "Diskouez pe kuzhat designoù ar profil."
 
 #: actions/othersettings.php:153
+#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
+msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
 
 #: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
 
 #: actions/otp.php:83
+#, fuzzy
 msgid "No login token specified."
-msgstr ""
+msgstr "N'eus bet diferet ali ebet."
 
 #: actions/otp.php:90
+#, fuzzy
 msgid "No login token requested."
-msgstr ""
+msgstr "N'eus profil ID ebet er reked."
 
 #: actions/otp.php:95
+#, fuzzy
 msgid "Invalid login token specified."
-msgstr ""
+msgstr "Fichenn direizh."
 
 #: actions/otp.php:104
+#, fuzzy
 msgid "Login token expired."
-msgstr ""
+msgstr "Kevreañ d'al lec'hienn"
 
 #: actions/outbox.php:58
 #, php-format
@@ -2627,13 +2667,14 @@ msgid "Paths"
 msgstr "Hentoù"
 
 #: actions/pathsadminpanel.php:70
+#, fuzzy
 msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ."
 
 #: actions/pathsadminpanel.php:157
 #, fuzzy, php-format
 msgid "Theme directory not readable: %s."
-msgstr "N'eus ket tu kaout an dodenn : %s"
+msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #: actions/pathsadminpanel.php:163
 #, fuzzy, php-format
@@ -2731,12 +2772,14 @@ msgid "Background server"
 msgstr "Servijer ar backgroundoù"
 
 #: actions/pathsadminpanel.php:309
+#, fuzzy
 msgid "Background path"
-msgstr ""
+msgstr "Background"
 
 #: actions/pathsadminpanel.php:313
+#, fuzzy
 msgid "Background directory"
-msgstr ""
+msgstr "Servijer ar backgroundoù"
 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
@@ -2998,13 +3041,15 @@ msgstr ""
 "gentañ da embann un dra !"
 
 #: actions/public.php:242
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #: actions/public.php:247
 #, php-format
@@ -3214,8 +3259,9 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432
+#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #: actions/register.php:437
 msgid "6 or more characters. Required."
@@ -3366,7 +3412,7 @@ msgstr "Ne c'helloc'h ket adkemer ho ali deoc'h."
 msgid "You already repeated that notice."
 msgstr "Adkemeret o peus dija an ali-mañ."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Adlavaret"
 
@@ -3429,7 +3475,7 @@ msgstr "Respontoù da %1$s war %2$s !"
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
+msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
@@ -3440,8 +3486,9 @@ msgid "StatusNet"
 msgstr "StatusNet"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr ""
+msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
@@ -3567,8 +3614,9 @@ msgid "%1$s's favorite notices, page %2$d"
 msgstr "Alioù karetañ %1$s, pajenn %2$d"
 
 #: actions/showfavorites.php:132
+#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
 #: actions/showfavorites.php:171
 #, php-format
@@ -3681,7 +3729,7 @@ msgid "Created"
 msgstr "Krouet"
 
 #: actions/showgroup.php:455
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -3689,15 +3737,19 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #: actions/showgroup.php:461
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #: actions/showgroup.php:489
 msgid "Admins"
@@ -3763,9 +3815,10 @@ msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
 #: actions/showstream.php:200
-#, php-format
+#, fuzzy, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr ""
+"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
 
 #: actions/showstream.php:205
 msgid ""
@@ -3781,21 +3834,25 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:243
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #: actions/showstream.php:248
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
+"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
+"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
 
 #: actions/showstream.php:305
 #, php-format
@@ -3803,8 +3860,9 @@ msgid "Repeat of %s"
 msgstr "Adkemeret eus %s"
 
 #: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
 msgid "You cannot silence users on this site."
-msgstr ""
+msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #: actions/silence.php:72
 msgid "User is already silenced."
@@ -3819,8 +3877,9 @@ msgid "Site name must have non-zero length."
 msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn."
 
 #: actions/siteadminpanel.php:141
+#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr ""
+msgstr "N'eo ket ur chomlec'h postel reizh."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -3872,8 +3931,9 @@ msgid "Local"
 msgstr "Lec'hel"
 
 #: actions/siteadminpanel.php:256
+#, fuzzy
 msgid "Default timezone"
-msgstr ""
+msgstr "Koumanantoù dre ziouer"
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
@@ -3994,8 +4054,9 @@ msgstr "Niverenn bellgomz evit an SMS"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
+#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
@@ -4021,8 +4082,9 @@ msgstr "Niverenn bellgomz ebet."
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
+#, fuzzy
 msgid "No carrier selected."
-msgstr ""
+msgstr "Ali dilammet."
 
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
@@ -4093,20 +4155,23 @@ msgid "Snapshots"
 msgstr "Prim"
 
 #: actions/snapshotadminpanel.php:65
+#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr ""
+msgstr "Kefluniadur ar primoù"
 
 #: actions/snapshotadminpanel.php:127
+#, fuzzy
 msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Roll direizh."
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
+#, fuzzy
 msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "URL fall evit al logo."
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
@@ -4117,8 +4182,9 @@ msgid "In a scheduled job"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:206
+#, fuzzy
 msgid "Data snapshots"
-msgstr ""
+msgstr "Prim"
 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
@@ -4143,16 +4209,18 @@ msgstr ""
 #: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
-msgstr "Enrollañ an arventennoù moned"
+msgstr "Enrollañ arventennoù al lec'hienn"
 
 #: actions/subedit.php:70
+#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "N'hoc'h ket koumanantet da zen ebet."
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
+#, fuzzy
 msgid "Could not save subscription."
-msgstr ""
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
@@ -4181,13 +4249,14 @@ msgid "%1$s subscribers, page %2$d"
 msgstr "Koumanantet da %1$s, pajenn %2$d"
 
 #: actions/subscribers.php:63
+#, fuzzy
 msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "Heuliañ a reoc'h alioù an dud-se."
 
 #: actions/subscribers.php:67
-#, php-format
+#, fuzzy, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr ""
+msgstr "Heuliet eo alioù an den-mañ gant %s."
 
 #: actions/subscribers.php:108
 msgid ""
@@ -4202,11 +4271,13 @@ msgstr ""
 "n'ez eus den ebet koumanantet da %s. Ha c'hoant o peus bezañ an hini gentañ ?"
 
 #: actions/subscribers.php:114
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
+"gentañ da embann un dra !"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4310,24 +4381,28 @@ msgid "Could not save tags."
 msgstr "Dibosupl eo enrollañ ar merkoù."
 
 #: actions/tagother.php:236
+#, fuzzy
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
+msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
 
 #: actions/tagrss.php:35
+#, fuzzy
 msgid "No such tag."
-msgstr ""
+msgstr "N'eus ket eus ar bajenn-se."
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "N'o peus ket stanket an implijer-mañ."
 
 #: actions/unsandbox.php:72
+#, fuzzy
 msgid "User is not sandboxed."
-msgstr ""
+msgstr "Er poull-traezh emañ dija an implijer."
 
 #: actions/unsilence.php:72
+#, fuzzy
 msgid "User is not silenced."
-msgstr ""
+msgstr "Lakaet eo bet da mut an implijer-mañ dija."
 
 #: actions/unsubscribe.php:77
 msgid "No profile ID in request."
@@ -4338,10 +4413,12 @@ msgid "Unsubscribed"
 msgstr "Digoumanantet"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
+"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
+"lec'hienn \"%2$s\"."
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
@@ -4350,8 +4427,9 @@ msgid "User"
 msgstr "Implijer"
 
 #: actions/useradminpanel.php:70
+#, fuzzy
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ."
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
@@ -4389,16 +4467,20 @@ msgid "New user welcome"
 msgstr "Degemer an implijerien nevez"
 
 #: actions/useradminpanel.php:236
+#, fuzzy
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
 
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
 msgstr "Koumanantoù dre ziouer"
 
 #: actions/useradminpanel.php:242
+#, fuzzy
 msgid "Automatically subscribe new users to this user."
 msgstr ""
+"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
+"evit an implijerien nann-denel)"
 
 #: actions/useradminpanel.php:251
 msgid "Invitations"
@@ -4409,8 +4491,9 @@ msgid "Invitations enabled"
 msgstr "Pedadennoù gweredekaet"
 
 #: actions/useradminpanel.php:258
+#, fuzzy
 msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Ma rankomp merañ an dalc'hoù hon unan."
 
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
@@ -4659,15 +4742,16 @@ msgstr "C'hwitet eo bet an disenskrivadur d'ar strollad."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
+#, fuzzy
 msgid "Could not update local group."
-msgstr ""
+msgstr "Diposubl eo hizivaat ar strollad."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, php-format
+#, fuzzy, php-format
 msgid "Could not create login token for %s"
-msgstr ""
+msgstr "Diposubl eo krouiñ an aliasoù."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -4676,8 +4760,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
+#, fuzzy
 msgid "You are banned from sending direct messages."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
@@ -4698,9 +4783,9 @@ msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:190
-#, php-format
+#, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr ""
+msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:260
@@ -4727,8 +4812,9 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 #: classes/Notice.php:286
+#, fuzzy
 msgid "You are banned from posting notices on this site."
-msgstr ""
+msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
@@ -4748,7 +4834,7 @@ msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
 
 #. 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4801,13 +4887,13 @@ msgstr "Nann-koumanantet !"
 #: classes/Subscription.php:178
 #, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Dibosupl eo paouez gant ar c'houmanant."
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 #, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Diposubl eo dilemel ar postel kadarnadur."
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
@@ -4889,8 +4975,9 @@ msgstr "Pajenn hep anv"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #: lib/action.php:436
+#, fuzzy
 msgid "Primary site navigation"
-msgstr ""
+msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
@@ -5021,8 +5108,9 @@ msgstr "Ali ar bajenn"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
+#, fuzzy
 msgid "Secondary site navigation"
-msgstr ""
+msgstr "Arventennoù diazez al lec'hienn"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5099,9 +5187,9 @@ msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
-#, php-format
+#, fuzzy, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
@@ -5157,8 +5245,9 @@ msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 #: lib/adminpanelaction.php:98
+#, fuzzy
 msgid "You cannot make changes to this site."
-msgstr ""
+msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
@@ -5367,8 +5456,9 @@ msgid "Notices where this attachment appears"
 msgstr ""
 
 #: lib/attachmenttagcloudsection.php:48
+#, fuzzy
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "N'eo ket bet kavet ar restr stag."
 
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
@@ -5525,18 +5615,21 @@ msgstr "Ali bet adkemeret dija"
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #: lib/command.php:529
-#, php-format
+#, fuzzy, php-format
 msgid "Notice from %s repeated"
-msgstr ""
+msgstr "Ali adkemeret"
 
 #: lib/command.php:531
+#, fuzzy
 msgid "Error repeating notice."
-msgstr ""
+msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #: lib/command.php:562
-#, php-format
+#, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
+"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
+"arouezenn o peus lakaet"
 
 #: lib/command.php:571
 #, php-format
@@ -5544,8 +5637,9 @@ msgid "Reply to %s sent"
 msgstr "Respont kaset da %s"
 
 #: lib/command.php:573
+#, fuzzy
 msgid "Error saving notice."
-msgstr ""
+msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
@@ -5570,8 +5664,9 @@ msgid "Unsubscribed from %s"
 msgstr "Digoumanantiñ da %s"
 
 #: lib/command.php:682 lib/command.php:705
+#, fuzzy
 msgid "Command not yet implemented."
-msgstr ""
+msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
 #: lib/command.php:685
 msgid "Notification off."
@@ -5611,8 +5706,8 @@ msgstr "N'hoc'h ket koumanantet da zen ebet."
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "You are subscribed to this person:"
-msgstr[1] "You are subscribed to these people:"
+msgstr[0] "Koumanantet oc'h dija d'an implijerien-mañ :"
+msgstr[1] "Koumanantet oc'h dija d'an implijerien-mañ :"
 
 #: lib/command.php:800
 msgid "No one is subscribed to you."
@@ -5622,8 +5717,8 @@ msgstr "Den n'eo koumanantet deoc'h."
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "This person is subscribed to you:"
-msgstr[1] "These people are subscribed to you:"
+msgstr[0] "Den n'eo koumanantet deoc'h."
+msgstr[1] "Den n'eo koumanantet deoc'h."
 
 #: lib/command.php:822
 msgid "You are not a member of any groups."
@@ -5633,8 +5728,8 @@ msgstr "N'oc'h ezel eus strollad ebet."
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] "You are a member of this group:"
-msgstr[1] "You are a member of these groups:"
+msgstr[0] "N'oc'h ket ezel eus ar strollad-mañ."
+msgstr[1] "N'oc'h ket ezel eus ar strollad-mañ."
 
 #: lib/command.php:838
 msgid ""
@@ -5711,8 +5806,9 @@ msgid "Connections"
 msgstr "Kevreadennoù"
 
 #: lib/connectsettingsaction.php:121
+#, fuzzy
 msgid "Authorized connected applications"
-msgstr ""
+msgstr "Poeladoù kevreet."
 
 #: lib/dberroraction.php:60
 msgid "Database error"
@@ -5728,8 +5824,9 @@ msgid ""
 msgstr ""
 
 #: lib/designsettings.php:418
+#, fuzzy
 msgid "Design defaults restored."
-msgstr ""
+msgstr "Enrollet eo bet an arventennoù design."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -5772,8 +5869,9 @@ msgid "All"
 msgstr "An holl"
 
 #: lib/galleryaction.php:139
+#, fuzzy
 msgid "Select tag to filter"
-msgstr ""
+msgstr "Dibab un douger"
 
 #: lib/galleryaction.php:140
 msgid "Tag"
@@ -5793,22 +5891,25 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:163
+#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
+msgstr "URL pajenn degemer ar poellad-mañ"
 
 #: lib/groupeditform.php:168
+#, fuzzy
 msgid "Describe the group or topic"
-msgstr ""
+msgstr "Deskrivit ho poellad"
 
 #: lib/groupeditform.php:170
-#, php-format
+#, fuzzy, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "Diskrivit ho poellad gant %d arouezenn"
 
 #: lib/groupeditform.php:179
+#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -5829,9 +5930,9 @@ msgid "%s blocked users"
 msgstr "%s implijer stanket"
 
 #: lib/groupnav.php:108
-#, php-format
+#, fuzzy, php-format
 msgid "Edit %s group properties"
-msgstr ""
+msgstr "Kemmañ ar strollad  %s"
 
 #: lib/groupnav.php:113
 msgid "Logo"
@@ -5843,13 +5944,14 @@ msgid "Add or edit %s logo"
 msgstr "Ouzhpennañ pe kemmañ logo %s"
 
 #: lib/groupnav.php:120
-#, php-format
+#, fuzzy, php-format
 msgid "Add or edit %s design"
-msgstr ""
+msgstr "Ouzhpennañ pe kemmañ logo %s"
 
 #: lib/groupsbymemberssection.php:71
+#, fuzzy
 msgid "Groups with most members"
-msgstr ""
+msgstr "Ezel eo %s eus ar strolladoù"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
@@ -5866,17 +5968,19 @@ msgid "This page is not available in a media type you accept"
 msgstr ""
 
 #: lib/imagefile.php:72
+#, fuzzy
 msgid "Unsupported image file format."
-msgstr ""
+msgstr "Diembreget eo ar furmad-se."
 
 #: lib/imagefile.php:88
-#, php-format
+#, fuzzy, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr ""
+msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
 
 #: lib/imagefile.php:93
+#, fuzzy
 msgid "Partial upload."
-msgstr ""
+msgstr "N'eus bet enporzhiet restr ebet."
 
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
@@ -5908,9 +6012,9 @@ msgid "[%s]"
 msgstr "[%s]"
 
 #: lib/jabber.php:567
-#, php-format
+#, fuzzy, php-format
 msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "Yezh \"%s\" dizanv."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -5921,8 +6025,9 @@ msgid "Leave"
 msgstr "Kuitaat"
 
 #: lib/logingroupnav.php:80
+#, fuzzy
 msgid "Login with a username and password"
-msgstr ""
+msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
@@ -5953,9 +6058,9 @@ msgstr ""
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
+msgstr "Ne heuilh %s den ebet."
 
 #: lib/mail.php:248
 #, php-format
@@ -5982,9 +6087,9 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, php-format
+#, fuzzy, php-format
 msgid "Bio: %s"
-msgstr ""
+msgstr "Lec'hiadur : %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6019,9 +6124,9 @@ msgstr "Kadarnadur SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
-#, php-format
+#, fuzzy, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr ""
+msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
@@ -6074,9 +6179,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, php-format
+#, fuzzy, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
+msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6146,8 +6251,9 @@ msgid ""
 msgstr ""
 
 #: lib/mailbox.php:89
+#, fuzzy
 msgid "Only the user can read their own mailboxes."
-msgstr ""
+msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
 
 #: lib/mailbox.php:139
 msgid ""
@@ -6155,30 +6261,33 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "eus"
 
 #: lib/mailhandler.php:37
+#, fuzzy
 msgid "Could not parse message."
-msgstr ""
+msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
 
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "N'eo ket un implijer enrollet."
 
 #: lib/mailhandler.php:46
+#, fuzzy
 msgid "Sorry, that is not your incoming email address."
-msgstr ""
+msgstr "N'eo ket ho postel."
 
 #: lib/mailhandler.php:50
+#, fuzzy
 msgid "Sorry, no incoming email allowed."
-msgstr ""
+msgstr "Chomlec'h postel ebet o tont."
 
 #: lib/mailhandler.php:228
-#, php-format
+#, fuzzy, php-format
 msgid "Unsupported message type: %s"
-msgstr ""
+msgstr "Diembreget eo ar furmad-se."
 
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
@@ -6219,8 +6328,9 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
+#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr ""
+msgstr "Diposubl eo termeniñ an implijer mammenn."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6241,8 +6351,9 @@ msgid "To"
 msgstr "Da"
 
 #: lib/messageform.php:159 lib/noticeform.php:185
+#, fuzzy
 msgid "Available characters"
-msgstr ""
+msgstr "6 arouezenn pe muioc'h"
 
 #: lib/messageform.php:178 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
@@ -6309,23 +6420,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "e"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "en amdro"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Adkemeret gant"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Respont d'an ali-mañ"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Respont"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Ali adkemeret"
 
@@ -6350,20 +6461,23 @@ msgid "Error inserting avatar"
 msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
 #: lib/oauthstore.php:306
+#, fuzzy
 msgid "Error updating remote profile"
-msgstr ""
+msgstr "Fazi en ur hizivaat ar profil a-bell."
 
 #: lib/oauthstore.php:311
+#, fuzzy
 msgid "Error inserting remote profile"
-msgstr ""
+msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez"
 
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
 msgstr "Eilañ an ali"
 
 #: lib/oauthstore.php:490
+#, fuzzy
 msgid "Couldn't insert new subscription."
-msgstr ""
+msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #: lib/personalgroupnav.php:99
 msgid "Personal"
@@ -6394,9 +6508,9 @@ msgid "Your sent messages"
 msgstr "Ar c'hemenadennoù kaset ganeoc'h"
 
 #: lib/personaltagcloudsection.php:56
-#, php-format
+#, fuzzy, php-format
 msgid "Tags in %s's notices"
-msgstr ""
+msgstr "N'eus ali nevez evit an implijer-mañ"
 
 #: lib/plugin.php:115
 msgid "Unknown"
@@ -6452,16 +6566,18 @@ msgid "Recent tags"
 msgstr "Merkoù nevez"
 
 #: lib/publicgroupnav.php:88
+#, fuzzy
 msgid "Featured"
-msgstr ""
+msgstr "Krouet"
 
 #: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Poblek"
 
 #: lib/redirectingaction.php:95
+#, fuzzy
 msgid "No return-to arguments."
-msgstr ""
+msgstr "Arguzenn ID ebet."
 
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
@@ -6489,8 +6605,9 @@ msgid "Sandbox"
 msgstr "Poull-traezh"
 
 #: lib/sandboxform.php:78
+#, fuzzy
 msgid "Sandbox this user"
-msgstr ""
+msgstr "Distankañ an implijer-mañ"
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -6537,18 +6654,19 @@ msgid "Silence"
 msgstr "Didrouz"
 
 #: lib/silenceform.php:78
+#, fuzzy
 msgid "Silence this user"
-msgstr ""
+msgstr "Diverkañ an implijer-mañ"
 
 #: lib/subgroupnav.php:83
-#, php-format
+#, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr ""
+msgstr "Koumanantet da %s"
 
 #: lib/subgroupnav.php:91
-#, php-format
+#, fuzzy, php-format
 msgid "People subscribed to %s"
-msgstr ""
+msgstr "Koumanantet da %s"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6560,9 +6678,9 @@ msgid "Invite"
 msgstr "Pediñ"
 
 #: lib/subgroupnav.php:106
-#, php-format
+#, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
+msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -6627,20 +6745,24 @@ msgid "Top posters"
 msgstr "An implijerien an efedusañ"
 
 #: lib/unsandboxform.php:69
+#, fuzzy
 msgid "Unsandbox"
-msgstr ""
+msgstr "Poull-traezh"
 
 #: lib/unsandboxform.php:80
+#, fuzzy
 msgid "Unsandbox this user"
-msgstr ""
+msgstr "Distankañ an implijer-mañ"
 
 #: lib/unsilenceform.php:67
+#, fuzzy
 msgid "Unsilence"
-msgstr ""
+msgstr "Didrouz"
 
 #: lib/unsilenceform.php:78
+#, fuzzy
 msgid "Unsilence this user"
-msgstr ""
+msgstr "Distankañ an implijer-mañ"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 6eee49858..a8a11e4ba 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:20+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:11:54+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -173,8 +173,8 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
-"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 #, fuzzy, php-format
@@ -182,8 +182,8 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to his or her attention."
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -367,7 +367,7 @@ msgstr "Could not delete favourite."
 #: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Could not follow user: User not found."
+msgstr "Could not unfollow user: User not found."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -383,9 +383,8 @@ msgid "You cannot unfollow yourself."
 msgstr "You cannot unfollow yourself."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Two user ids or screen_names must be supplied."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -789,7 +788,7 @@ msgid "Preview"
 msgstr "Preview"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Delete"
 
@@ -1070,7 +1069,7 @@ msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
@@ -2128,8 +2127,9 @@ msgid "This is your inbox, which lists your incoming private messages."
 msgstr "This is your inbox, which lists your incoming private messages."
 
 #: actions/invite.php:39
+#, fuzzy
 msgid "Invites have been disabled."
-msgstr ""
+msgstr "Invitations enabled"
 
 #: actions/invite.php:41
 #, php-format
@@ -2493,11 +2493,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Updates matching search term \"%1$s\" on %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"This user doesn't allow nudges or hasn't confirmed or set his e-mail yet."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2529,8 +2527,9 @@ msgid "Connected applications"
 msgstr "Connected applications"
 
 #: actions/oauthconnectionssettings.php:83
+#, fuzzy
 msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "You have not authorised any applications to use your account."
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
@@ -2609,8 +2608,9 @@ msgid "View profile designs"
 msgstr "View profile designs"
 
 #: actions/othersettings.php:123
+#, fuzzy
 msgid "Show or hide profile designs."
-msgstr ""
+msgstr "View profile designs"
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
@@ -2717,8 +2717,9 @@ msgid "Paths"
 msgstr ""
 
 #: actions/pathsadminpanel.php:70
+#, fuzzy
 msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "Basic settings for this StatusNet site"
 
 #: actions/pathsadminpanel.php:157
 #, php-format
@@ -2785,16 +2786,19 @@ msgid "Theme"
 msgstr ""
 
 #: actions/pathsadminpanel.php:264
+#, fuzzy
 msgid "Theme server"
-msgstr ""
+msgstr "SSL server"
 
 #: actions/pathsadminpanel.php:268
+#, fuzzy
 msgid "Theme path"
-msgstr ""
+msgstr "Site path"
 
 #: actions/pathsadminpanel.php:272
+#, fuzzy
 msgid "Theme directory"
-msgstr ""
+msgstr "Avatar directory"
 
 #: actions/pathsadminpanel.php:279
 msgid "Avatars"
@@ -2813,20 +2817,24 @@ msgid "Avatar directory"
 msgstr "Avatar directory"
 
 #: actions/pathsadminpanel.php:301
+#, fuzzy
 msgid "Backgrounds"
-msgstr ""
+msgstr "Background"
 
 #: actions/pathsadminpanel.php:305
+#, fuzzy
 msgid "Background server"
-msgstr ""
+msgstr "Background"
 
 #: actions/pathsadminpanel.php:309
+#, fuzzy
 msgid "Background path"
-msgstr ""
+msgstr "Background"
 
 #: actions/pathsadminpanel.php:313
+#, fuzzy
 msgid "Background directory"
-msgstr ""
+msgstr "Background directory not writable: %s."
 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
@@ -2845,8 +2853,9 @@ msgid "Always"
 msgstr ""
 
 #: actions/pathsadminpanel.php:329
+#, fuzzy
 msgid "Use SSL"
-msgstr ""
+msgstr "SSL"
 
 #: actions/pathsadminpanel.php:330
 msgid "When to use SSL"
@@ -3062,21 +3071,24 @@ msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
 #: actions/public.php:188
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
 msgstr ""
+"This is the timeline for %s and friends but no one has posted anything yet."
 
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
 #: actions/public.php:195
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
 #: actions/public.php:242
 #, php-format
@@ -3121,11 +3133,13 @@ msgid "Be the first to post one!"
 msgstr ""
 
 #: actions/publictagcloud.php:75
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
 #: actions/publictagcloud.php:134
 msgid "Tag cloud"
@@ -3172,8 +3186,9 @@ msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 #: actions/recoverpassword.php:188
+#, fuzzy
 msgid "Password recovery"
-msgstr ""
+msgstr "Password recovery requested"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
@@ -3463,7 +3478,7 @@ msgstr "You can't repeat your own notice."
 msgid "You already repeated that notice."
 msgstr "You already repeated that notice."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repeated"
 
@@ -3502,9 +3517,7 @@ msgstr "Notice feed for %s"
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to his attention yet."
+msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 
 #: actions/replies.php:204
 #, php-format
@@ -3519,8 +3532,8 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
-"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3550,8 +3563,9 @@ msgstr "User is already sandboxed."
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
+#, fuzzy
 msgid "Sessions"
-msgstr ""
+msgstr "Version"
 
 #: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site."
@@ -3619,16 +3633,18 @@ msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 #: actions/showapplication.php:213
+#, fuzzy
 msgid "Application actions"
-msgstr ""
+msgstr "Application not found."
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
+#, fuzzy
 msgid "Application info"
-msgstr ""
+msgstr "Application not found."
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3693,13 +3709,11 @@ msgstr ""
 "notices you like to bookmark them for later or shed a spotlight on them."
 
 #: actions/showfavorites.php:208
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s hasn't added any notices to his favourites yet. Post something "
-"interesting they would add to their favourites :)"
 
 #: actions/showfavorites.php:212
 #, fuzzy, php-format
@@ -3708,9 +3722,8 @@ msgid ""
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s hasn't added any notices to his favourites yet. Why not [register an "
-"account](%%%%action.register%%%%) and then post something interesting they "
-"would add to their favourites :)"
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3892,17 +3905,21 @@ msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"You can try to nudge %1$s or [post something to his or her attention](%%%%"
-"action.newnotice%%%%?status_textarea=%2$s)."
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/showstream.php:243
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
 
 #: actions/showstream.php:248
 #, php-format
@@ -3990,8 +4007,9 @@ msgid "Local"
 msgstr "Local"
 
 #: actions/siteadminpanel.php:256
+#, fuzzy
 msgid "Default timezone"
-msgstr ""
+msgstr "Default subscription"
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
@@ -4217,16 +4235,18 @@ msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 
 #: actions/snapshotadminpanel.php:127
+#, fuzzy
 msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Invalid role."
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
+#, fuzzy
 msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "nvalid logo URL."
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
@@ -4237,8 +4257,9 @@ msgid "In a scheduled job"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:206
+#, fuzzy
 msgid "Data snapshots"
-msgstr ""
+msgstr "Save snapshot settings"
 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
@@ -4253,8 +4274,9 @@ msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:226
+#, fuzzy
 msgid "Report URL"
-msgstr ""
+msgstr "Source URL"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
@@ -4322,11 +4344,13 @@ msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
 #: actions/subscribers.php:114
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favourites!"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4472,8 +4496,9 @@ msgid "User"
 msgstr "User"
 
 #: actions/useradminpanel.php:70
+#, fuzzy
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "Design settings for this StausNet site."
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
@@ -4507,12 +4532,14 @@ msgid "New users"
 msgstr "New users"
 
 #: actions/useradminpanel.php:235
+#, fuzzy
 msgid "New user welcome"
-msgstr ""
+msgstr "New users"
 
 #: actions/useradminpanel.php:236
+#, fuzzy
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "Name is too long (max 255 chars)."
 
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
@@ -4622,9 +4649,9 @@ msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
 #: actions/userauthorization.php:345
-#, php-format
+#, fuzzy, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "Callback URL is not valid."
 
 #: actions/userauthorization.php:350
 #, php-format
@@ -4696,8 +4723,9 @@ msgid ""
 msgstr ""
 
 #: actions/version.php:163
+#, fuzzy
 msgid "Contributors"
-msgstr ""
+msgstr "Connections"
 
 #: actions/version.php:170
 msgid ""
@@ -4894,7 +4922,7 @@ msgstr "Problem saving group inbox."
 
 #. 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4932,8 +4960,9 @@ msgstr "You have been banned from subscribing."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
+#, fuzzy
 msgid "Already subscribed!"
-msgstr ""
+msgstr "Not subscribed!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
@@ -4950,19 +4979,19 @@ msgstr "Not subscribed!"
 #: classes/Subscription.php:178
 #, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Couldn't delete self-subscription."
+msgstr "Could not save subscription."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 #, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Couldn't delete subscription OMB token."
+msgstr "Could not save subscription."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
 #, fuzzy
 msgid "Could not delete subscription."
-msgstr "Couldn't delete subscription."
+msgstr "Could not save subscription."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5400,13 +5429,15 @@ msgstr ""
 
 #. TRANS: Form legend.
 #: lib/applicationeditform.php:137
+#, fuzzy
 msgid "Edit application"
-msgstr ""
+msgstr "Edit Application"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:187
+#, fuzzy
 msgid "Icon for this application"
-msgstr ""
+msgstr "Do not delete this application"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
@@ -5503,13 +5534,15 @@ msgstr "Revoke"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
+#, fuzzy
 msgid "Attachments"
-msgstr ""
+msgstr "No attachments."
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
+#, fuzzy
 msgid "Author"
-msgstr ""
+msgstr "Authorise URL"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
@@ -5521,8 +5554,9 @@ msgid "Notices where this attachment appears"
 msgstr ""
 
 #: lib/attachmenttagcloudsection.php:48
+#, fuzzy
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "No such attachment."
 
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
@@ -5912,8 +5946,9 @@ msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
 #: lib/designsettings.php:418
+#, fuzzy
 msgid "Design defaults restored."
-msgstr ""
+msgstr "Design preferences saved."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -6313,9 +6348,9 @@ msgid ""
 msgstr ""
 
 #: lib/mail.php:657
-#, php-format
+#, fuzzy, php-format
 msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) added your notice as a favorite"
 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
@@ -6355,7 +6390,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "from"
 
@@ -6509,23 +6544,23 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repeated by"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Reply to this notice"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Reply"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Notice repeated"
 
@@ -6827,16 +6862,18 @@ msgid "Top posters"
 msgstr "Top posters"
 
 #: lib/unsandboxform.php:69
+#, fuzzy
 msgid "Unsandbox"
-msgstr ""
+msgstr "Sandbox"
 
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
 #: lib/unsilenceform.php:67
+#, fuzzy
 msgid "Unsilence"
-msgstr ""
+msgstr "Silence"
 
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index e9890ef36..4f7b3f0e7 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:27+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:08+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -805,7 +805,7 @@ msgid "Preview"
 msgstr "Aperçu"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1086,7 +1086,7 @@ msgid "Do not delete this notice"
 msgstr "Ne pas supprimer cet avis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
@@ -3538,7 +3538,7 @@ msgstr "Vous ne pouvez pas reprendre votre propre avis."
 msgid "You already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repris"
 
@@ -5020,7 +5020,7 @@ msgstr "Problème lors de l’enregistrement de la boîte de réception du group
 
 #. 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6594,7 +6594,7 @@ msgstr ""
 "pour démarrer des conversations avec d’autres utilisateurs. Ceux-ci peuvent "
 "vous envoyer des messages destinés à vous seul(e)."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "de"
 
@@ -6754,23 +6754,23 @@ msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
 msgid "at"
 msgstr "chez"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "dans le contexte"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repris par"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Répondre à cet avis"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Répondre"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Avis repris"
 
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 82541026b..ccde993d4 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:35+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:24+0000\n"
 "Language-Team: Interlingua\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: out-statusnet\n"
@@ -790,7 +790,7 @@ msgid "Preview"
 msgstr "Previsualisation"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Deler"
 
@@ -1071,7 +1071,7 @@ msgid "Do not delete this notice"
 msgstr "Non deler iste nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
@@ -3499,7 +3499,7 @@ msgstr "Tu non pote repeter tu proprie nota."
 msgid "You already repeated that notice."
 msgstr "Tu ha ja repetite iste nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetite"
 
@@ -4964,7 +4964,7 @@ msgstr "Problema salveguardar le cassa de entrata del gruppo."
 
 #. 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6522,7 +6522,7 @@ msgstr ""
 "altere usatores in conversation. Altere personas pote inviar te messages que "
 "solmente tu pote leger."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "de"
 
@@ -6682,23 +6682,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "a"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "in contexto"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetite per"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Responder a iste nota"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Nota repetite"
 
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 5b5bb0424..8ba2443a6 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Korean
 #
 # Author@translatewiki.net: Brion
+# Author@translatewiki.net: Changwoo
 # Author@translatewiki.net: Twkang
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -9,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:43+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:37+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -322,7 +323,7 @@ msgstr "메시지 내용이 없습니다!"
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
 #, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "너무 깁니다. 최대 메시지 길이는 %d 자까지입니다."
+msgstr "너무 깁니다. 최대 메시지 길이는 %d자 까지입니다."
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -356,7 +357,7 @@ msgstr "관심소식을 삭제할 수 없습니다."
 #: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "팔로우할 수 없습니다: 이용자 없음."
+msgstr "언팔로우할 수 없습니다: 이용자 없음."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -372,9 +373,8 @@ msgid "You cannot unfollow yourself."
 msgstr "자기 자신을 언팔로우할 수 없습니다."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "두 개의 사용자 ID나 대화명을 입력해야 합니다."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -456,15 +456,16 @@ msgstr ""
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 #, fuzzy
 msgid "Group not found."
-msgstr "그룹을 찾을 수 없습니다."
+msgstr "찾을 수가 없습니다."
 
 #: actions/apigroupjoin.php:111 actions/joingroup.php:100
 msgid "You are already a member of that group."
 msgstr "당신은 이미 이 그룹의 멤버입니다."
 
 #: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#, fuzzy
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "귀하는 구독이 금지되었습니다."
 
 #: actions/apigroupjoin.php:139 actions/joingroup.php:134
 #, php-format
@@ -478,19 +479,19 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
 #, fuzzy, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
+msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
 #, php-format
 msgid "%s's groups"
-msgstr "%s의 그룹들"
+msgstr "%s의 그룹"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "%s 그룹들은  의 멤버입니다."
+msgstr "%1$s 사이트의 그룹에 %2$s 사용자가 멤버입니다."
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -502,12 +503,12 @@ msgstr "%s 그룹"
 #: actions/apigrouplistall.php:96
 #, php-format
 msgid "groups on %s"
-msgstr "%s 상의 그룹들"
+msgstr "%s 사이트의 그룹"
 
 #: actions/apimediaupload.php:99
 #, fuzzy
 msgid "Upload failed."
-msgstr "올리기"
+msgstr "실행 실패"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -534,7 +535,7 @@ msgstr "옳지 않은 크기"
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
-msgstr "세션토큰에 문제가 있습니다. 다시 시도해주세요."
+msgstr "세션토큰에 문제가 있습니다. 다시 시도해주십시오."
 
 #: actions/apioauthauthorize.php:135
 #, fuzzy
@@ -678,17 +679,17 @@ msgstr "지원하지 않는 형식입니다."
 #: actions/apitimelinefavorites.php:110
 #, fuzzy, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / %s의 좋아하는 글들"
+msgstr "%1$s의 상태 (%2$s에서)"
 
 #: actions/apitimelinefavorites.php:119
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s 좋아하는 글이 업데이트 됐습니다. %S에 의해 / %s."
+msgstr "%1$s님이 %2$s/%3$s의 업데이트에 답변했습니다."
 
 #: actions/apitimelinementions.php:118
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / %2$s에게 답신 업데이트"
+msgstr "%1$s의 상태 (%2$s에서)"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -764,7 +765,7 @@ msgstr "당신의 개인 아바타를 업로드할 수 있습니다. 최대 파
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
-msgstr "프로필 매칭이 없는 사용자"
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -782,7 +783,7 @@ msgid "Preview"
 msgstr "미리보기"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "삭제"
 
@@ -801,7 +802,7 @@ msgstr "프로필을 지정하지 않았습니다."
 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
-msgstr "당신의 아바타가 될 이미지영역을 지정하세요."
+msgstr "그림에서 당신의 아바타로 사용할 영역을 지정하십시오."
 
 #: actions/avatarsettings.php:347 actions/grouplogo.php:380
 msgid "Lost our file data."
@@ -844,7 +845,6 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
 msgstr "아니오"
@@ -863,10 +863,9 @@ msgstr "이용자를 차단하지 않는다."
 #: actions/block.php:160 actions/deleteapplication.php:161
 #: actions/deletenotice.php:154 actions/deleteuser.php:159
 #: actions/groupblock.php:185
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
-msgstr "네, 맞습니다."
+msgstr "예"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
@@ -899,7 +898,7 @@ msgstr "이용자 프로필"
 #: actions/blockedfromgroup.php:100
 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s 와 친구들, %d 페이지"
+msgstr "%s 및 친구들, %d 페이지"
 
 #: actions/blockedfromgroup.php:115
 #, fuzzy
@@ -922,7 +921,7 @@ msgstr "이 사용자를 차단해제합니다."
 #: actions/bookmarklet.php:51
 #, fuzzy, php-format
 msgid "Post to %s"
-msgstr "사진"
+msgstr "%s 사이트의 그룹"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -938,9 +937,9 @@ msgstr "그 인증 코드는 귀하의 것이 아닙니다!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "인식되지않은 주소유형 %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -966,7 +965,7 @@ msgstr "사용자를 업데이트 할 수 없습니다."
 #: actions/confirmaddress.php:128 actions/emailsettings.php:433
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
-msgstr "이메일 승인을 삭제 할 수 없습니다."
+msgstr "메일 승인을 삭제 할 수 없습니다."
 
 #: actions/confirmaddress.php:146
 msgid "Confirm address"
@@ -978,9 +977,8 @@ msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" 는 귀하의 계정으로 승인되었습니다."
 
 #: actions/conversation.php:99
-#, fuzzy
 msgid "Conversation"
-msgstr "인증 코드"
+msgstr "대화"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
@@ -990,12 +988,12 @@ msgstr "통지"
 #: actions/deleteapplication.php:63
 #, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #: actions/deleteapplication.php:71
 #, fuzzy
 msgid "Application not found."
-msgstr "통지에 프로필이 없습니다."
+msgstr "인증 코드가 없습니다."
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
@@ -1024,13 +1022,13 @@ msgstr ""
 #: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
-msgstr "이 통지를 지울 수 없습니다."
+msgstr "응용프로그램 삭제"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
-msgstr "이 게시글 삭제하기"
+msgstr "응용프로그램 삭제"
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1048,12 +1046,10 @@ msgid "Can't delete this notice."
 msgstr "이 통지를 지울 수 없습니다."
 
 #: actions/deletenotice.php:103
-#, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
-"영구적으로 게시글을 삭제하려고 합니다. 한번 삭제되면, 복구할 수 없습니다."
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -1070,14 +1066,14 @@ msgid "Do not delete this notice"
 msgstr "이 통지를 지울 수 없습니다."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "이 게시글 삭제하기"
 
 #: actions/deleteuser.php:67
 #, fuzzy
 msgid "You cannot delete users."
-msgstr "사용자를 업데이트 할 수 없습니다."
+msgstr "이용자를 업데이트 할 수 없습니다."
 
 #: actions/deleteuser.php:74
 #, fuzzy
@@ -1096,16 +1092,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "이 게시글 삭제하기"
+msgstr "이 사용자 삭제"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
 #: lib/groupnav.php:119
 msgid "Design"
-msgstr ""
+msgstr "디자인"
 
 #: actions/designadminpanel.php:74
 msgid "Design settings for this StatusNet site."
@@ -1118,7 +1113,7 @@ msgstr "잘못된 로고 URL 입니다."
 #: actions/designadminpanel.php:322
 #, fuzzy, php-format
 msgid "Theme not available: %s."
-msgstr "테마를 이용할 수 없습니다: %s"
+msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #: actions/designadminpanel.php:426
 msgid "Change logo"
@@ -1141,9 +1136,8 @@ msgid "Theme for the site."
 msgstr "사이트에 대한 테마"
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "사이트 테마"
+msgstr "사용자 지정 테마"
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1189,9 +1183,8 @@ msgid "Change colours"
 msgstr "색상 변경"
 
 #: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
 msgid "Content"
-msgstr "연결"
+msgstr "만족하는"
 
 #: actions/designadminpanel.php:600 lib/designsettings.php:204
 #, fuzzy
@@ -1203,17 +1196,16 @@ msgid "Text"
 msgstr "문자"
 
 #: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
 msgid "Links"
-msgstr "로그인"
+msgstr "링크"
 
 #: actions/designadminpanel.php:651
 msgid "Advanced"
-msgstr ""
+msgstr "고급 검색"
 
 #: actions/designadminpanel.php:655
 msgid "Custom CSS"
-msgstr ""
+msgstr "사용자 CSS"
 
 #: actions/designadminpanel.php:676 lib/designsettings.php:247
 msgid "Use defaults"
@@ -1239,8 +1231,9 @@ msgid "Save"
 msgstr "저장"
 
 #: actions/designadminpanel.php:686 lib/designsettings.php:257
+#, fuzzy
 msgid "Save design"
-msgstr ""
+msgstr "프로필 디자인"
 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
@@ -1253,7 +1246,7 @@ msgstr "좋아하는 게시글로 추가하기"
 #: actions/doc.php:158
 #, fuzzy, php-format
 msgid "No such document \"%s\""
-msgstr "그러한 문서는 없습니다."
+msgstr "해당하는 첨부파일이 없습니다."
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
@@ -1267,7 +1260,7 @@ msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 #: actions/showapplication.php:87
 #, fuzzy
 msgid "No such application."
-msgstr "그러한 통지는 없습니다."
+msgstr "신규 응용 프로그램"
 
 #: actions/editapplication.php:161
 #, fuzzy
@@ -1295,8 +1288,9 @@ msgid "Description is required."
 msgstr "설명"
 
 #: actions/editapplication.php:194
+#, fuzzy
 msgid "Source URL is too long."
-msgstr ""
+msgstr "소스 코드 URL"
 
 #: actions/editapplication.php:200 actions/newapplication.php:185
 #, fuzzy
@@ -1364,34 +1358,34 @@ msgstr "그룹을 업데이트 할 수 없습니다."
 #: actions/editgroup.php:264 classes/User_group.php:514
 #, fuzzy
 msgid "Could not create aliases."
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
+msgstr "관심소식을 생성할 수 없습니다."
 
 #: actions/editgroup.php:280
 msgid "Options saved."
-msgstr "옵션들이 저장되었습니다."
+msgstr "옵션을 저장했습니다."
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
 msgid "Email settings"
-msgstr "이메일 설정"
+msgstr "메일 설정"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
 #: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
-msgstr "%%site.name%%에서 어떻게 이메일을 받을지 정하십시오."
+msgstr "%%site.name%%에서 어떻게 메일을 받을지 정하십시오."
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 #: actions/emailsettings.php:106 actions/emailsettings.php:132
 msgid "Email address"
-msgstr "이메일 주소"
+msgstr "메일 주소"
 
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
-msgstr "확인된 최신의 이메일 계정"
+msgstr "확인된 최신의 메일 계정"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
@@ -1401,10 +1395,9 @@ msgstr "확인된 최신의 이메일 계정"
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "삭제"
+msgstr "제거"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1420,7 +1413,6 @@ msgstr ""
 #. TRANS: Button label
 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "취소"
@@ -1428,14 +1420,13 @@ msgstr "취소"
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
-msgstr "\"UserName@example.org\" 와 같은 이메일 계정"
+msgstr "\"사용자이름@예제.org\"와 같은 메일 계정"
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
 msgstr "추가"
@@ -1444,13 +1435,13 @@ msgstr "추가"
 #. TRANS: Form legend for incoming SMS settings form.
 #: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
-msgstr "받은 이메일"
+msgstr "받은 메일"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
-msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오/"
+msgstr "새로운 통지를 올리려면 이 주소로 메일을 보내십시오."
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
@@ -1461,84 +1452,80 @@ msgstr "포스팅을 위한 새 이메일 계정의 생성; 전 이메일 계정
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "새로운"
+msgstr "새 게임"
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "설정"
+msgstr "메일 설정"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
-msgstr "새로운 예약 구독의 통지를 이메일로 보내주세요."
+msgstr "새로운 예약 구독의 통지를 메일로 보내주세요."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "누군가 내 글을 좋아하는 게시글로 추가했을때, 이메일을 보냅니다."
+msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
-msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
+msgstr "누군가 내게 비밀메시지를 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:199
-#, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "누군가 내게 비밀메시지를 보냈을때, 이메일을 보냅니다."
+msgstr "누군가 내게 @ 답장을 보냈을 때, 메일을 보냅니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
-msgstr "친구들이 내게 이메일이나 쪽지를 보낼 수 있도록 허용합니다."
+msgstr "친구들이 내게 메일이나 쪽지를 보낼 수 있도록 허용합니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:212
 msgid "I want to post notices by email."
-msgstr "이메일로 통보를 포스트 하길 원합니다."
+msgstr "메일로 통보를 포스트합니다."
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
-msgstr "이메일 주소를 위한 MicroID의 생성"
+msgstr "메일 주소를 위한 MicroID의 생성"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "싱크설정이 저장되었습니다."
+msgstr "메일 설정이 저장되었습니다."
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
-msgstr "이메일이 추가 되지 않았습니다."
+msgstr "메일 주소가 없습니다."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
-msgstr "그 이메일 주소를 정규화 할 수 없습니다."
+msgstr "메일 주소를 정규화 할 수 없습니다."
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
-msgstr "유효한 이메일 주소가 아닙니다."
+msgstr "올바른 메일 주소가 아닙니다."
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/emailsettings.php:370
 msgid "That is already your email address."
-msgstr "그 이메일 주소는 이미 귀하의 것입니다."
+msgstr "그 메일 주소는 이미 귀하의 것입니다."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
-msgstr "그 이메일 주소는 이미 다른 사용자의 소유입니다."
+msgstr "그 메일 주소는 이미 다른 사용자의 소유입니다."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
@@ -1554,7 +1541,7 @@ msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
-"추가한 이메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드"
+"추가한 메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드"
 "와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
@@ -1575,23 +1562,22 @@ msgstr "옳지 않은 메신저 계정 입니다."
 #: actions/emailsettings.php:438
 #, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "인증 취소"
+msgstr "취소 할 대기중인 인증이 없습니다."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 #: actions/emailsettings.php:458
 msgid "That is not your email address."
-msgstr "그 이메일 주소는 귀하의 것이 아닙니다."
+msgstr "그 메일 주소는 귀하의 것이 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "주소가 삭제되었습니다."
+msgstr "메일 주소를 지웠습니다."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
-msgstr "이메일 주소가 없습니다."
+msgstr "받는 메일 주소가 없습니다."
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
@@ -1603,12 +1589,12 @@ msgstr "사용자 기록을 업데이트 할 수 없습니다."
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
-msgstr "받은 이메일 계정 삭제"
+msgstr "받는 메일 주소를 지웠습니다."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
-msgstr "새로운 이메일 주소가 추가 되었습니다."
+msgstr "새로운 받는 메일 주소를 추가했습니다."
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1653,7 +1639,7 @@ msgstr ""
 #: lib/personalgroupnav.php:115
 #, php-format
 msgid "%s's favorite notices"
-msgstr "%s 님의 좋아하는 글들"
+msgstr "%s 님의 좋아하는 글"
 
 #: actions/favoritesrss.php:115
 #, fuzzy, php-format
@@ -1671,19 +1657,19 @@ msgid "Featured users, page %d"
 msgstr "인기있는 회원, %d페이지"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s"
-msgstr "%s의 훌륭한 회원의 일부 선택"
+msgstr ""
 
 #: actions/file.php:34
 #, fuzzy
 msgid "No notice ID."
-msgstr "새로운 통지"
+msgstr "그러한 통지는 없습니다."
 
 #: actions/file.php:38
 #, fuzzy
 msgid "No notice."
-msgstr "새로운 통지"
+msgstr "그러한 통지는 없습니다."
 
 #: actions/file.php:42
 msgid "No attachments."
@@ -1692,16 +1678,15 @@ msgstr "첨부문서 없음"
 #: actions/file.php:51
 #, fuzzy
 msgid "No uploaded attachments."
-msgstr "그러한 문서는 없습니다."
+msgstr "첨부문서 없음"
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "예상치 못한 반응 입니다."
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "살펴 보고 있는 사용자가 없습니다."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1709,22 +1694,20 @@ msgstr "당신은 로컬 구독을 사용할 수 있습니다."
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
-msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
+msgstr "이 사용자는 귀하의 구독을 차단했습니다."
 
 #: actions/finishremotesubscribe.php:110
 #, fuzzy
 msgid "You are not authorized."
-msgstr "인증이 되지 않았습니다."
+msgstr "당신은 이 프로필에 구독되지 않고있습니다."
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "리퀘스트 토큰을 엑세스 토큰으로 변환 할 수 없습니다."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "OMB 프로토콜의 알려지지 않은 버전"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:138
 #, fuzzy
@@ -1751,12 +1734,12 @@ msgstr ""
 #: actions/grantrole.php:75
 #, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #: actions/grantrole.php:82
 #, fuzzy
 msgid "User already has this role."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1783,7 +1766,7 @@ msgstr ""
 #: actions/groupblock.php:95
 #, fuzzy
 msgid "User is already blocked from group."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr "사용자가 귀하를 차단했습니다."
 
 #: actions/groupblock.php:100
 #, fuzzy
@@ -1793,34 +1776,36 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 #, fuzzy
 msgid "Block user from group"
-msgstr "사용자를 차단합니다."
+msgstr "그룹 이용자는 차단해제"
 
 #: actions/groupblock.php:160
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
+"정말 이용자를 차단하시겠습니까? 차단된 이용자는 구독해제되고, 이후 당신을 구"
+"독할 수 없으며, 차단된 이용자로부터 @-답장의 통보를 받지 않게 됩니다."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
-msgstr "이 그룹의 회원리스트"
+msgstr "이용자를 차단하지 않는다."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
-msgstr "이 그룹의 회원리스트"
+msgstr "그룹 이용자는 차단해제"
 
 #: actions/groupblock.php:206
+#, fuzzy
 msgid "Database error blocking user from group."
-msgstr ""
+msgstr "그룹 이용자는 차단해제"
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
 msgstr "ID가 없습니다."
 
@@ -1832,7 +1817,7 @@ msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
 #: actions/groupdesignsettings.php:144
 #, fuzzy
 msgid "Group design"
-msgstr "그룹"
+msgstr "프로필 디자인"
 
 #: actions/groupdesignsettings.php:155
 msgid ""
@@ -1848,7 +1833,7 @@ msgstr "디자인을 수정할 수 없습니다."
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 #, fuzzy
 msgid "Design preferences saved."
-msgstr "싱크설정이 저장되었습니다."
+msgstr "메일 설정이 저장되었습니다."
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
@@ -1858,7 +1843,8 @@ msgstr "그룹 로고"
 #, fuzzy, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "당신그룹의 로고 이미지를 업로드할 수 있습니다."
+msgstr ""
+"사이트의 배경 이미지를 업로드할 수 있습니다. 최대 파일 크기는 %1$s 입니다."
 
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
@@ -1880,7 +1866,7 @@ msgstr "%s 그룹 회원"
 #: actions/groupmembers.php:103
 #, fuzzy, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "%s 그룹 회원, %d페이지"
+msgstr "%s 그룹 회원"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1953,8 +1939,8 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% 의 사람을 이름, 장소, 흥미로 검색. 검색어는 스페이스 구분한다; "
-"적어도 3글자 이상 필요."
+"%%site.name%%의 사람을 이름, 장소, 관심 거리로 검색합니다. 검색어는 공백으로 "
+"구분하고, 적어도 3글자 이상 필요합니다."
 
 #: actions/groupsearch.php:58
 msgid "Group search"
@@ -1962,7 +1948,6 @@ msgstr "그룹 찾기"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
 msgstr "결과 없음"
 
@@ -1987,7 +1972,7 @@ msgstr ""
 #: actions/groupunblock.php:95
 #, fuzzy
 msgid "User is not blocked from group."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr "그룹 이용자는 차단해제"
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
@@ -1997,7 +1982,7 @@ msgstr "차단 제거 에러!"
 #: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
-msgstr "메신저 설정"
+msgstr "메일 설정"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2021,7 +2006,7 @@ msgstr "인스턴트 메신저를 사용할 수 없습니다."
 #: actions/imsettings.php:106 actions/imsettings.php:136
 #, fuzzy
 msgid "IM address"
-msgstr "메신저 주소"
+msgstr "SMS 주소"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2053,7 +2038,7 @@ msgstr ""
 #: actions/imsettings.php:155
 #, fuzzy
 msgid "IM preferences"
-msgstr "설정"
+msgstr "메일 설정"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2124,15 +2109,14 @@ msgstr "옳지 않은 메신저 계정 입니다."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:397
-#, fuzzy
 msgid "Couldn't delete IM confirmation."
-msgstr "이메일 승인을 삭제 할 수 없습니다."
+msgstr "메신저 승인을 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
 #, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "인증 취소"
+msgstr "확인 코드가 없습니다."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2144,7 +2128,7 @@ msgstr "그 Jabber ID는 귀하의 것이 아닙니다."
 #: actions/imsettings.php:447
 #, fuzzy
 msgid "The IM address was removed."
-msgstr "주소가 삭제되었습니다."
+msgstr "메일 주소를 지웠습니다."
 
 #: actions/inbox.php:59
 #, fuzzy, php-format
@@ -2167,12 +2151,12 @@ msgstr ""
 #: actions/invite.php:41
 #, fuzzy, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "로그인을 해야 다른 사용자를 %s에 초대할 수 있습니다."
+msgstr "그룹가입을 위해서는 로그인이 필요합니다."
 
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
-msgstr "옳지 않은 이메일 주소 : %s"
+msgstr "올바르지 않은 메일 주소 : %s"
 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
@@ -2217,15 +2201,15 @@ msgstr "다음 양식을 이용해 친구와 동료를 이 서비스에 초대
 
 #: actions/invite.php:187
 msgid "Email addresses"
-msgstr "이메일 주소"
+msgstr "메일 주소"
 
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
-msgstr "초청할 친구들의 주소 (한 줄에 한 명씩)"
+msgstr "초청할 친구 주소 (한 줄에 한 명씩)"
 
 #: actions/invite.php:192
 msgid "Personal message"
-msgstr "개인적인 메시지"
+msgstr "개인 메시지"
 
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
@@ -2233,7 +2217,6 @@ msgstr "초대장에 메시지 첨부하기."
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "보내기"
@@ -2309,9 +2292,9 @@ msgstr "별명이 없습니다."
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s joined group %2$s"
-msgstr "%s 는 그룹 %s에 가입했습니다."
+msgstr ""
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
@@ -2326,7 +2309,7 @@ msgstr "당신은 해당 그룹의 멤버가 아닙니다."
 #: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s가 그룹%s를 떠났습니다."
+msgstr "%1$s의 상태 (%2$s에서)"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2337,9 +2320,8 @@ msgid "Incorrect username or password."
 msgstr "틀린 계정 또는 비밀 번호"
 
 #: actions/login.php:154 actions/otp.php:120
-#, fuzzy
 msgid "Error setting user. You are probably not authorized."
-msgstr "인증이 되지 않았습니다."
+msgstr ""
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -2374,37 +2356,34 @@ msgid "Login with your username and password."
 msgstr "사용자 이름과 비밀번호로 로그인"
 
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"귀하의 계정과 비밀 번호로 로그인 하세요. 계정이 아직 없으세요? [가입](%%"
-"action.register%%) 새 계정을 생성 또는 [OpenID](%%action.openidlogin%%)를 사"
-"용해 보세요."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
+msgstr ""
 
 #: actions/makeadmin.php:146
 #, fuzzy, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "관리자만 그룹을 편집할 수 있습니다."
+msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
 #: actions/microsummary.php:69
 #, fuzzy
 msgid "No current status."
-msgstr "현재 상태가 없습니다."
+msgstr "결과 없음"
 
 #: actions/newapplication.php:52
 msgid "New Application"
@@ -2413,7 +2392,7 @@ msgstr "신규 응용 프로그램"
 #: actions/newapplication.php:64
 #, fuzzy
 msgid "You must be logged in to register an application."
-msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #: actions/newapplication.php:143
 #, fuzzy
@@ -2421,13 +2400,14 @@ msgid "Use this form to register a new application."
 msgstr "새 그룹을 만들기 위해 이 양식을 사용하세요."
 
 #: actions/newapplication.php:176
+#, fuzzy
 msgid "Source URL is required."
-msgstr ""
+msgstr "소스 코드 URL"
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
 #, fuzzy
 msgid "Could not create application."
-msgstr "좋아하는 게시글을 생성할 수 없습니다."
+msgstr "관심소식을 생성할 수 없습니다."
 
 #: actions/newgroup.php:53
 msgid "New group"
@@ -2461,9 +2441,8 @@ msgstr ""
 "자신에게 메시지를 보내지 마세요. 대신 조용하게 스스로에게 그것을 말하세요;;"
 
 #: actions/newmessage.php:181
-#, fuzzy
 msgid "Message sent"
-msgstr "메시지"
+msgstr "쪽지가 전송되었습니다."
 
 #: actions/newmessage.php:185
 #, fuzzy, php-format
@@ -2488,8 +2467,8 @@ msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% 의 통지를 내용으로부터 검색. 검색어는 스페이스로 구분한다; 적어"
-"도 3글자 이상 필요."
+"%%site.name%%의 글 내용을 검색합니다. 검색어는 공백으로 구분하고, 적어도 3글"
+"자 이상 필요합니다."
 
 #: actions/noticesearch.php:78
 msgid "Text search"
@@ -2498,7 +2477,7 @@ msgstr "문자 검색"
 #: actions/noticesearch.php:91
 #, fuzzy, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "스트림에서 \"%s\" 검색"
+msgstr "%1$s에서 %2$s까지 메시지"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2515,21 +2494,19 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "%2$s에 있는 %1$s의 업데이트!"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "\"%s\" 에 일치하는 모든 업데이트"
+msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"이 사용자는 nudge를 허용하지 않았고, 아직 그의 이메일을 인증하지 않았습니다."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2542,25 +2519,26 @@ msgstr "찔러 보기를 보냈습니다!"
 #: actions/oauthappssettings.php:59
 #, fuzzy
 msgid "You must be logged in to list your applications."
-msgstr "그룹을 만들기 위해서는 로그인해야 합니다."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #: actions/oauthappssettings.php:74
 #, fuzzy
 msgid "OAuth applications"
-msgstr "다른 옵션들"
+msgstr "응용프로그램 삭제"
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
 #: actions/oauthappssettings.php:135
-#, php-format
+#, fuzzy, php-format
 msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #: actions/oauthconnectionssettings.php:72
+#, fuzzy
 msgid "Connected applications"
-msgstr ""
+msgstr "응용프로그램 삭제"
 
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
@@ -2577,8 +2555,9 @@ msgid "Unable to revoke access for app: %s."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:198
+#, fuzzy
 msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "다음 응용 프로그램이 계정에 접근하도록 허용되어 있습니다."
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
@@ -2587,7 +2566,7 @@ msgstr ""
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
-msgstr "통지에 프로필이 없습니다."
+msgstr "이용자가 프로필을 가지고 있지 않습니다."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2596,9 +2575,9 @@ msgstr "%1$s의 상태 (%2$s에서)"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "연결"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2623,11 +2602,11 @@ msgstr "통지 검색"
 #: actions/othersettings.php:60
 #, fuzzy
 msgid "Other settings"
-msgstr "기타 설정"
+msgstr "아바타 설정"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
-msgstr "다양한 다른 옵션관리"
+msgstr "여러가지 기타 옵션을 관리합니다."
 
 #: actions/othersettings.php:108
 msgid " (free service)"
@@ -2635,20 +2614,20 @@ msgstr ""
 
 #: actions/othersettings.php:116
 msgid "Shorten URLs with"
-msgstr ""
+msgstr "URL 줄이기 기능"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
-msgstr "사용할 URL 자동 줄이기 서비스"
+msgstr "사용할 URL 자동 줄이기 서비스."
 
 #: actions/othersettings.php:122
-#, fuzzy
 msgid "View profile designs"
-msgstr "프로필 세팅"
+msgstr "프로필 디자인 보기"
 
 #: actions/othersettings.php:123
+#, fuzzy
 msgid "Show or hide profile designs."
-msgstr ""
+msgstr "프로필 디자인 보기"
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
@@ -2667,12 +2646,11 @@ msgstr "프로필을 지정하지 않았습니다."
 #: actions/otp.php:90
 #, fuzzy
 msgid "No login token requested."
-msgstr "요청한 프로필id가 없습니다."
+msgstr "허용되지 않는 요청입니다."
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "옳지 않은 통지 내용"
+msgstr ""
 
 #: actions/otp.php:104
 #, fuzzy
@@ -2728,7 +2706,7 @@ msgstr "위와 같은 비밀 번호"
 
 #: actions/passwordsettings.php:117
 msgid "Change"
-msgstr "변환"
+msgstr "변경"
 
 #: actions/passwordsettings.php:154 actions/register.php:237
 msgid "Password must be 6 or more characters."
@@ -2756,32 +2734,34 @@ msgstr "비밀 번호 저장"
 
 #. TRANS: Menu item for site administration
 #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#, fuzzy
 msgid "Paths"
-msgstr ""
+msgstr "경로"
 
 #: actions/pathsadminpanel.php:70
+#, fuzzy
 msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "이 StatusNet 사이트에 대한 디자인 설정"
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "아바타 디렉토리에 쓸 수 없습니다 : %s"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2790,12 +2770,12 @@ msgstr ""
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 #, fuzzy
 msgid "Site"
-msgstr "초대"
+msgstr "사이트"
 
 #: actions/pathsadminpanel.php:238
 #, fuzzy
 msgid "Server"
-msgstr "복구"
+msgstr "SSL 서버"
 
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
@@ -2803,12 +2783,12 @@ msgstr ""
 
 #: actions/pathsadminpanel.php:242
 msgid "Path"
-msgstr ""
+msgstr "경로"
 
 #: actions/pathsadminpanel.php:242
 #, fuzzy
 msgid "Site path"
-msgstr "사이트 공지"
+msgstr "사이트 테마"
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
@@ -2831,12 +2811,14 @@ msgid "Theme"
 msgstr "테마"
 
 #: actions/pathsadminpanel.php:264
+#, fuzzy
 msgid "Theme server"
-msgstr ""
+msgstr "SSL 서버"
 
 #: actions/pathsadminpanel.php:268
+#, fuzzy
 msgid "Theme path"
-msgstr ""
+msgstr "테마"
 
 #: actions/pathsadminpanel.php:272
 msgid "Theme directory"
@@ -2860,28 +2842,31 @@ msgstr "아바타가 업데이트 되었습니다."
 #: actions/pathsadminpanel.php:292
 #, fuzzy
 msgid "Avatar directory"
-msgstr "아바타가 업데이트 되었습니다."
+msgstr "아바타가 삭제되었습니다."
 
 #: actions/pathsadminpanel.php:301
+#, fuzzy
 msgid "Backgrounds"
-msgstr ""
+msgstr "배경"
 
 #: actions/pathsadminpanel.php:305
+#, fuzzy
 msgid "Background server"
-msgstr ""
+msgstr "배경"
 
 #: actions/pathsadminpanel.php:309
+#, fuzzy
 msgid "Background path"
-msgstr ""
+msgstr "배경"
 
 #: actions/pathsadminpanel.php:313
+#, fuzzy
 msgid "Background directory"
-msgstr ""
+msgstr "배경"
 
 #: actions/pathsadminpanel.php:320
-#, fuzzy
 msgid "SSL"
-msgstr "SMS"
+msgstr "SSL"
 
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
 #, fuzzy
@@ -2906,18 +2891,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "복구"
+msgstr "SSL 서버"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "사이트 공지"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2925,8 +2908,8 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% 의 사람을 이름, 장소, 흥미로 검색. 검색어는 스페이스 구분한다; "
-"적어도 3글자 이상 필요."
+"%%site.name%%의 사람을 이름, 장소, 관심 거리로 검색합니다. 검색어는 공백으로 "
+"구분하고, 적어도 3글자 이상 필요합니다."
 
 #: actions/peoplesearch.php:58
 msgid "People search"
@@ -2935,17 +2918,17 @@ msgstr "사람 찾기"
 #: actions/peopletag.php:68
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
-msgstr "유효한 태그가 아닙니다: %s"
+msgstr "올바른 메일 주소가 아닙니다."
 
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "이용자 셀프 테크 %s - %d 페이지"
+msgstr ""
 
 #: actions/postnotice.php:95
 #, fuzzy
 msgid "Invalid notice content."
-msgstr "옳지 않은 통지 내용"
+msgstr "옳지 않은 크기"
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2954,7 +2937,7 @@ msgstr ""
 
 #: actions/profilesettings.php:60
 msgid "Profile settings"
-msgstr "프로필 세팅"
+msgstr "프로필 설정"
 
 #: actions/profilesettings.php:71
 msgid ""
@@ -2988,14 +2971,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "귀하의 홈페이지, 블로그 혹은 다른 사이트의 프로필 페이지 URL"
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "140자 이내에서 자기 소개"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "당신에 대해 소개해주세요."
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3010,7 +2992,7 @@ msgstr "위치"
 
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라"
+msgstr "당신은 어디에 삽니까? \"시, 도 (or 군,구), 나라\""
 
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
@@ -3037,11 +3019,11 @@ msgstr "언어 설정"
 
 #: actions/profilesettings.php:161
 msgid "Timezone"
-msgstr "타임존"
+msgstr "시간대"
 
 #: actions/profilesettings.php:162
 msgid "What timezone are you normally in?"
-msgstr "당신이 주로 생활하는 곳이 어떤 타임존입니까?"
+msgstr "주로 생활하는 곳이 어느 시간대입니까?"
 
 #: actions/profilesettings.php:167
 msgid ""
@@ -3051,7 +3033,7 @@ msgstr "나에게 구독하는 사람에게 자동 구독 신청"
 #: actions/profilesettings.php:228 actions/register.php:230
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "자기소개가 너무 깁니다. (최대 140글자)"
+msgstr "설명이 너무 깁니다. (최대 %d 글자)"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3064,7 +3046,7 @@ msgstr "언어가 너무 깁니다. (최대 50글자)"
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "유효하지 않은태그: \"%s\""
+msgstr "올바르지 않은 태그: \"%s\""
 
 #: actions/profilesettings.php:306
 msgid "Couldn't update user for autosubscribe."
@@ -3107,19 +3089,16 @@ msgid "Public timeline"
 msgstr "퍼블릭 타임라인"
 
 #: actions/public.php:160
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "퍼블릭 스트림 피드"
+msgstr ""
 
 #: actions/public.php:164
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "퍼블릭 스트림 피드"
+msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "퍼블릭 스트림 피드"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3130,8 +3109,9 @@ msgstr ""
 "%%site.name%% 의 공개 타임라인이지만, 아직 아무도 글을 쓰지 않았습니다."
 
 #: actions/public.php:191
+#, fuzzy
 msgid "Be the first to post!"
-msgstr ""
+msgstr "글을 올린 첫번째 사람이 되세요!"
 
 #: actions/public.php:195
 #, php-format
@@ -3149,14 +3129,12 @@ msgid ""
 msgstr ""
 
 #: actions/public.php:247
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
-"%%site.name%% 는 마이크로블로깅(http://en.wikipedia.org/wiki/Micro-blogging) "
-"서비스 입니다."
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -3216,22 +3194,25 @@ msgid "Could not update user with confirmed email address."
 msgstr "이 이메일 주소로 사용자를 업데이트 할 수 없습니다."
 
 #: actions/recoverpassword.php:152
+#, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
-msgstr ""
+msgstr "가입하신 이메일로 비밀 번호 재발급에 관한 안내를 보냈습니다."
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 #: actions/recoverpassword.php:188
+#, fuzzy
 msgid "Password recovery"
-msgstr ""
+msgstr "비밀 번호 복구가 요청되었습니다."
 
 #: actions/recoverpassword.php:191
+#, fuzzy
 msgid "Nickname or email address"
-msgstr ""
+msgstr "별명이나 이메일 계정을 입력하십시오."
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -3323,7 +3304,7 @@ msgstr "회원 가입이 성공적입니다."
 
 #: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
 msgid "Register"
-msgstr "회원가입"
+msgstr "등록"
 
 #: actions/register.php:142
 msgid "Registration not allowed."
@@ -3376,10 +3357,10 @@ msgid "Longer name, preferably your \"real\" name"
 msgstr "더욱 긴 이름을 요구합니다."
 
 #: actions/register.php:518
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #: actions/register.php:528
 #, php-format
@@ -3398,14 +3379,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr "다음 개인정보 제외: 비밀 번호, 메일 주소, 메신저 주소, 전화 번호"
+msgstr ""
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3422,20 +3403,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%s님 축하드립니다! %%%%site.name%%%%에 가입하신 것을 환영합니다!. 이제부터 아"
-"래의 일을 할 수 있습니다...\n"
-"\n"
-"* [나의 프로필](%s) 로 가셔서 첫 메시지를 포스트 해보십시오.\n"
-"* [Jabber 또는 GTalk계정](%%%%action.imsettings%%%%)을 추가하셔서 메신저로 통"
-"보를 받아 보십시오.\n"
-"* [친구 찾기](%%%%action.peoplesearch%%%%) 알거나 같은 관심사를 가지고 있는 "
-"분들을 찾아 보십시오. \n"
-"* [프로필 셋팅](%%%%action.profilesettings%%%%)을 업데이트 하셔서 다른분들에"
-"게 자신을 알려보십시오. \n"
-"* [온라인 도움말](%%%%doc.help%%%%)을 읽으면서 더 많은 기능을 확인해 보십시"
-"오. \n"
-"\n"
-"다시 한번 가입하신 것을 환영하면서 즐거운 서비스가 되셨으면 합니다."
 
 #: actions/register.php:607
 msgid ""
@@ -3491,19 +3458,16 @@ msgid "Invalid profile URL (bad format)"
 msgstr "옳지 않은 프로필 URL (나쁜 포멧)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "유효한 프로필 URL이 아닙니다. (YADIS 문서가 없습니다)"
+msgstr ""
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
-msgstr "그것은 로컬프로필입니다. 구독을 위해서는 로그인하십시오."
+msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "리퀘스트 토큰을 취득 할 수 없습니다."
+msgstr ""
 
 #: actions/repeat.php:57
 #, fuzzy
@@ -3522,9 +3486,9 @@ msgstr "자신의 글은 재전송할 수 없습니다."
 #: actions/repeat.php:90
 #, fuzzy
 msgid "You already repeated that notice."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+msgstr "이미 재전송된 소식입니다."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "재전송됨"
 
@@ -3541,7 +3505,7 @@ msgstr "%s에 답신"
 #: actions/replies.php:128
 #, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "%2$s에서 %1$s까지 메시지"
+msgstr "%s에 답신"
 
 #: actions/replies.php:145
 #, fuzzy, php-format
@@ -3587,36 +3551,36 @@ msgstr "%2$s에서 %1$s까지 메시지"
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "프로필 매칭이 없는 사용자"
+msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
 #, fuzzy
 msgid "StatusNet"
-msgstr "아바타가 업데이트 되었습니다."
+msgstr "StatusNet %s"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
+#, fuzzy
 msgid "Sessions"
-msgstr ""
+msgstr "버전"
 
 #: actions/sessionsadminpanel.php:65
+#, fuzzy
 msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "이 StatusNet 사이트에 대한 디자인 설정"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -3638,17 +3602,17 @@ msgstr ""
 #: actions/useradminpanel.php:294
 #, fuzzy
 msgid "Save site settings"
-msgstr "아바타 설정"
+msgstr "접근 설정을 저장"
 
 #: actions/showapplication.php:82
 #, fuzzy
 msgid "You must be logged in to view an application."
-msgstr "그룹을 떠나기 위해서는 로그인해야 합니다."
+msgstr "응용 프로그램 수정을 위해서는 로그인해야 합니다."
 
 #: actions/showapplication.php:157
 #, fuzzy
 msgid "Application profile"
-msgstr "통지에 프로필이 없습니다."
+msgstr "신규 응용 프로그램"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3658,9 +3622,8 @@ msgstr ""
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:199
-#, fuzzy
 msgid "Name"
-msgstr "별명"
+msgstr "이름"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
@@ -3685,16 +3648,18 @@ msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 #: actions/showapplication.php:213
+#, fuzzy
 msgid "Application actions"
-msgstr ""
+msgstr "신규 응용 프로그램"
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
+#, fuzzy
 msgid "Application info"
-msgstr ""
+msgstr "신규 응용 프로그램"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3713,8 +3678,9 @@ msgid "Access token URL"
 msgstr ""
 
 #: actions/showapplication.php:283
+#, fuzzy
 msgid "Authorize URL"
-msgstr ""
+msgstr "작성자"
 
 #: actions/showapplication.php:288
 msgid ""
@@ -3730,7 +3696,7 @@ msgstr "정말로 통지를 삭제하시겠습니까?"
 #: actions/showfavorites.php:79
 #, fuzzy, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s 님의 좋아하는 글들"
+msgstr "%s 님의 좋아하는 글"
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
@@ -3774,7 +3740,7 @@ msgstr ""
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "좋아하는 글을 지정하면 자기가 무엇을 좋아하는지 알릴 수 있습니다."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
@@ -3784,7 +3750,7 @@ msgstr "%s 그룹"
 #: actions/showgroup.php:84
 #, fuzzy, php-format
 msgid "%1$s group, page %2$d"
-msgstr "%s 그룹 회원, %d페이지"
+msgstr "그룹, %d 페이지"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3836,16 +3802,15 @@ msgstr "회원"
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr "(없습니다.)"
+msgstr "(없음)"
 
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr "모든 회원"
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "생성"
+msgstr "생성됨"
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3858,15 +3823,13 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:461
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** 는 %%%%site.name%%%% [마이크로블로깅)(http://en.wikipedia.org/wiki/"
-"Micro-blogging)의 사용자 그룹입니다. "
 
 #: actions/showgroup.php:489
 #, fuzzy
@@ -3904,27 +3867,27 @@ msgstr "%s 태그된 통지"
 #: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s 와 친구들, %d 페이지"
+msgstr "%s 및 친구들, %d 페이지"
 
 #: actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%s 그룹을 위한 공지피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
 #: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #: actions/showstream.php:148
 #, fuzzy, php-format
@@ -3932,9 +3895,9 @@ msgid "FOAF for %s"
 msgstr "%s의 보낸쪽지함"
 
 #: actions/showstream.php:200
-#, php-format
+#, fuzzy, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
+msgstr "%s 및 친구들의 타임라인이지만, 아직 아무도 글을 작성하지 않았습니다."
 
 #: actions/showstream.php:205
 msgid ""
@@ -3961,14 +3924,12 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s**는 %%%%site.name%%%% [마이크로블로깅](http://en.wikipedia.org/wiki/"
-"Micro-blogging) 서비스에 계정을 갖고 있습니다."
 
 #: actions/showstream.php:305
 #, fuzzy, php-format
@@ -3978,16 +3939,16 @@ msgstr "%s에 답신"
 #: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
 msgid "You cannot silence users on this site."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr ""
 
 #: actions/siteadminpanel.php:69
+#, fuzzy
 msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "이 StatusNet 사이트에 대한 디자인 설정"
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
@@ -3996,7 +3957,7 @@ msgstr ""
 #: actions/siteadminpanel.php:141
 #, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "유효한 이메일 주소가 아닙니다."
+msgstr "올바른 메일 주소가 아닙니다."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4018,7 +3979,7 @@ msgstr ""
 #: actions/siteadminpanel.php:224
 #, fuzzy
 msgid "Site name"
-msgstr "사이트 공지"
+msgstr "사이트 테마"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -4043,7 +4004,7 @@ msgstr ""
 #: actions/siteadminpanel.php:239
 #, fuzzy
 msgid "Contact email address for your site"
-msgstr "%s에 포스팅 할 새로운 이메일 주소"
+msgstr "%s에 포스팅 할 새로운 메일 주소"
 
 #: actions/siteadminpanel.php:245
 #, fuzzy
@@ -4100,7 +4061,7 @@ msgstr "새로운 메시지입니다."
 #: actions/sitenoticeadminpanel.php:103
 #, fuzzy
 msgid "Unable to save site notice."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+msgstr "디자인 설정을 저장할 수 없습니다."
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
@@ -4124,7 +4085,7 @@ msgstr "사이트 공지"
 #: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
-msgstr "SMS 세팅"
+msgstr "메일 설정"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4138,13 +4099,12 @@ msgstr ""
 #: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
-msgstr "이 페이지는 귀하가 승인한 미디어 타입에서는 이용할 수 없습니다."
+msgstr "인스턴트 메신저를 사용할 수 없습니다."
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "메신저 주소"
+msgstr "SMS 주소"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4168,16 +4128,15 @@ msgstr "휴대폰으로 받으신 인증번호를 입력하십시오."
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 #: actions/smssettings.php:148
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
-msgstr "인증"
+msgstr "확인"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
-msgstr "SMS 휴대폰 번호"
+msgstr "휴대폰 번호가 없습니다."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4188,7 +4147,7 @@ msgstr "지역번호와 함께 띄어쓰기 없이 번호를 적어 주세요."
 #: actions/smssettings.php:195
 #, fuzzy
 msgid "SMS preferences"
-msgstr "설정"
+msgstr "메일 설정"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4232,8 +4191,8 @@ msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"추가한 휴대폰으로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코"
-"드와 사용법을 확인하여 주시기 바랍니다."
+"추가한 메일로 인증 코드를 보냈습니다. 수신함(또는 스팸함)을 확인하셔서 코드"
+"와 사용법을 확인하여 주시기 바랍니다."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4244,7 +4203,7 @@ msgstr "옳지 않은 인증 번호 입니다."
 #: actions/smssettings.php:427
 #, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "인증 취소"
+msgstr "SMS 인증"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4256,7 +4215,7 @@ msgstr "그 휴대폰 번호는 귀하의 것이 아닙니다."
 #: actions/smssettings.php:470
 #, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "SMS 휴대폰 번호"
+msgstr "메일 주소를 지웠습니다."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4291,7 +4250,7 @@ msgstr ""
 #: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "주 사이트 네비게이션"
+msgstr "메일 주소 확인"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
@@ -4302,8 +4261,9 @@ msgid "Snapshot frequency must be a number."
 msgstr ""
 
 #: actions/snapshotadminpanel.php:144
+#, fuzzy
 msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "잘못된 로고 URL 입니다."
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
@@ -4330,8 +4290,9 @@ msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:226
+#, fuzzy
 msgid "Report URL"
-msgstr ""
+msgstr "소스 코드 URL"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
@@ -4340,7 +4301,7 @@ msgstr ""
 #: actions/snapshotadminpanel.php:248
 #, fuzzy
 msgid "Save snapshot settings"
-msgstr "아바타 설정"
+msgstr "접근 설정을 저장"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
@@ -4358,7 +4319,7 @@ msgstr ""
 #: actions/subscribe.php:107
 #, fuzzy
 msgid "No such profile."
-msgstr "그러한 통지는 없습니다."
+msgstr "해당하는 파일이 없습니다."
 
 #: actions/subscribe.php:117
 #, fuzzy
@@ -4377,7 +4338,7 @@ msgstr "%s 구독자"
 #: actions/subscribers.php:52
 #, fuzzy, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%s 구독자, %d 페이지"
+msgstr "%s 및 친구들, %d 페이지"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4414,7 +4375,7 @@ msgstr "%s 구독"
 #: actions/subscriptions.php:54
 #, fuzzy, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "%s subscriptions, %d 페이지"
+msgstr "%s 및 친구들, %d 페이지"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4438,7 +4399,7 @@ msgstr ""
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
 #, fuzzy, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s 는 지금 듣고 있습니다."
+msgstr "%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다."
 
 #: actions/subscriptions.php:208
 msgid "Jabber"
@@ -4451,27 +4412,27 @@ msgstr "SMS"
 #: actions/tag.php:69
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "이용자 셀프 테크 %s - %d 페이지"
+msgstr "%s 태그된 통지"
 
 #: actions/tag.php:87
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 1.0)"
 
 #: actions/tag.php:93
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (RSS 2.0)"
 
 #: actions/tag.php:99
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "%s의 통지 피드"
+msgstr "%s 그룹을 위한 공지피드 (Atom)"
 
 #: actions/tagother.php:39
 #, fuzzy
 msgid "No ID argument."
-msgstr "id 인자가 없습니다."
+msgstr "첨부문서 없음"
 
 #: actions/tagother.php:65
 #, php-format
@@ -4520,12 +4481,12 @@ msgstr "그러한 태그가 없습니다."
 #: actions/unblock.php:59
 #, fuzzy
 msgid "You haven't blocked that user."
-msgstr "당신은 이미 이 사용자를 차단하고 있습니다."
+msgstr "이미 차단된 이용자입니다."
 
 #: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr "이용자의 지속적인 게시글이 없습니다."
 
 #: actions/unsilence.php:72
 #, fuzzy
@@ -4535,7 +4496,7 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 #: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
-msgstr "요청한 프로필id가 없습니다."
+msgstr "해당 ID의 프로필이 없습니다."
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4549,14 +4510,14 @@ msgstr ""
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
-#, fuzzy
 msgctxt "TITLE"
 msgid "User"
-msgstr "이용자"
+msgstr "사용자"
 
 #: actions/useradminpanel.php:70
+#, fuzzy
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "이 StatusNet 사이트에 대한 디자인 설정"
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
@@ -4627,19 +4588,15 @@ msgid "Authorize subscription"
 msgstr "구독을 허가"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""
-"사용자의 통지를 구독하려면 상세를 확인해 주세요. 구독하지 않는 경우는, \"취소"
-"\"를 클릭해 주세요."
 
 #: actions/userauthorization.php:196 actions/version.php:167
-#, fuzzy
 msgid "License"
-msgstr "라이선스"
+msgstr "라이센스"
 
 #: actions/userauthorization.php:217
 msgid "Accept"
@@ -4668,28 +4625,22 @@ msgid "Subscription authorized"
 msgstr "구독 허가"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"구독이 승인 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
-"시를 찾아 구독 승인 방법에 대하여 읽어보십시오. 귀하의 구독 토큰은 : "
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "구독 거부"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"구독이 해지 되었습니다. 하지만 콜백 URL이 통과 되지 않았습니다. 웹사이트의 지"
-"시를 찾아 구독 해지 방법에 대하여 읽어보십시오."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4717,19 +4668,18 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "아바타 URL '%s'을(를) 읽어낼 수 없습니다."
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "%S 잘못된 그림 파일 타입입니다. "
+msgstr ""
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
 msgid "Profile design"
-msgstr "프로필 세팅"
+msgstr "프로필 디자인"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4745,12 +4695,11 @@ msgstr ""
 #: actions/usergroups.php:66
 #, fuzzy, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "%s 그룹 회원, %d페이지"
+msgstr "그룹, %d 페이지"
 
 #: actions/usergroups.php:132
-#, fuzzy
 msgid "Search for more groups"
-msgstr "프로필이나 텍스트 검색"
+msgstr ""
 
 #: actions/usergroups.php:159
 #, fuzzy, php-format
@@ -4774,9 +4723,9 @@ msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s에 있는 %1$s의 업데이트!"
 
 #: actions/version.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "StatusNet %s"
-msgstr "통계"
+msgstr "StatusNet %s"
 
 #: actions/version.php:155
 #, php-format
@@ -4787,7 +4736,7 @@ msgstr ""
 
 #: actions/version.php:163
 msgid "Contributors"
-msgstr ""
+msgstr "편집자"
 
 #: actions/version.php:170
 msgid ""
@@ -4819,11 +4768,12 @@ msgstr ""
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:789
 msgid "Version"
-msgstr "버젼"
+msgstr "버전"
 
 #: actions/version.php:199
+#, fuzzy
 msgid "Author(s)"
-msgstr ""
+msgstr "작성자"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #: classes/File.php:143
@@ -4880,7 +4830,7 @@ msgstr "그룹을 업데이트 할 수 없습니다."
 #: classes/Group_member.php:63
 #, fuzzy
 msgid "Group leave failed."
-msgstr "그룹 프로필"
+msgstr "그룹에 가입하지 못했습니다."
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
@@ -4927,7 +4877,7 @@ msgstr ""
 #: classes/Notice.php:190
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "해쉬테그를 추가 할 때에 데이타베이스 에러 : %s"
+msgstr "OAuth 응용 프로그램 사용자 추가 중 데이터베이스 오류"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:260
@@ -4982,7 +4932,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
@@ -5011,23 +4961,23 @@ msgstr "이용자가 프로필을 가지고 있지 않습니다."
 #: classes/Status_network.php:346
 #, fuzzy
 msgid "Unable to save tag."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+msgstr "태그를 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
 msgid "You have been banned from subscribing."
-msgstr "이 회원은 구독으로부터 당신을 차단해왔다."
+msgstr "귀하는 구독이 금지되었습니다."
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
+#, fuzzy
 msgid "Already subscribed!"
-msgstr ""
+msgstr "구독하고 있지 않습니다!"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
-msgstr "회원이 당신을 차단해왔습니다."
+msgstr "사용자가 귀하를 차단했습니다."
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
@@ -5039,19 +4989,19 @@ msgstr "구독하고 있지 않습니다!"
 #: classes/Subscription.php:178
 #, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "예약 구독을 삭제 할 수 없습니다."
+msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 #, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "예약 구독을 삭제 할 수 없습니다."
+msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
 #, fuzzy
 msgid "Could not delete subscription."
-msgstr "예약 구독을 삭제 할 수 없습니다."
+msgstr "구독을 저장할 수 없습니다."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5069,7 +5019,7 @@ msgstr "새 그룹을 만들 수 없습니다."
 #: classes/User_group.php:506
 #, fuzzy
 msgid "Could not set group URI."
-msgstr "그룹 맴버십을 세팅할 수 없습니다."
+msgstr "새 그룹을 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
@@ -5136,17 +5086,15 @@ msgstr "주 사이트 네비게이션"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "개인 프로필과 친구 타임라인"
+msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #: lib/action.php:445
-#, fuzzy
 msgctxt "MENU"
 msgid "Personal"
-msgstr "개인적인"
+msgstr "개인"
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
@@ -5156,10 +5104,9 @@ msgstr "당신의 이메일, 아바타, 비밀 번호, 프로필을 변경하세
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "서버에 재접속 할 수 없습니다 : %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5175,10 +5122,9 @@ msgstr "주 사이트 네비게이션"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
-#, fuzzy
 msgctxt "MENU"
 msgid "Admin"
-msgstr "관리자"
+msgstr "관리"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
@@ -5195,41 +5141,35 @@ msgstr "초대"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "이 사이트로부터 로그아웃"
+msgstr "이 사이트에서 로그아웃"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
 msgstr "로그아웃"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "계정 만들기"
+msgstr "새 계정 만들기"
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:485
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
-msgstr "회원가입"
+msgstr "등록"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr "이 사이트 로그인"
+msgstr "이 사이트에 로그인"
 
 #: lib/action.php:491
-#, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "로그인"
@@ -5239,23 +5179,20 @@ msgstr "로그인"
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "도움이 필요해!"
+msgstr "도움말"
 
 #: lib/action.php:497
-#, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "도움말"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "프로필이나 텍스트 검색"
+msgstr ""
 
 #: lib/action.php:503
-#, fuzzy
 msgctxt "MENU"
 msgid "Search"
 msgstr "검색"
@@ -5299,7 +5236,7 @@ msgstr "자주 묻는 질문"
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 #: lib/action.php:779
 msgid "TOS"
-msgstr ""
+msgstr "서비스 약관"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 #: lib/action.php:783
@@ -5317,24 +5254,21 @@ msgid "Contact"
 msgstr "연락하기"
 
 #: lib/action.php:794
-#, fuzzy
 msgid "Badge"
-msgstr "찔러 보기"
+msgstr "배지"
 
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
-msgstr "라코니카 소프트웨어 라이선스"
+msgstr "StatusNet 소프트웨어 라이선스"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** 는 [%%site.broughtby%%](%%site.broughtbyurl%%)가 제공하는 "
-"마이크로블로깅서비스입니다."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5356,34 +5290,34 @@ msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
 #: lib/action.php:850
-#, fuzzy
 msgid "Site content license"
-msgstr "라코니카 소프트웨어 라이선스"
+msgstr "사이트 컨텐츠 라이선스"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "%1$s의 컨텐츠와 데이터는 외부 유출을 금지합니다."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #: lib/action.php:864
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
-msgstr ""
+msgstr "컨텐츠와 데이터의 저작권은 %1$s의 소유입니다. All rights reserved."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #: lib/action.php:868
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
+"컨텐츠와 데이터의 저작권은 각 이용자의 소유입니다. All rights reserved."
 
 #. TRANS: license message in footer. %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:881
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "%1$s의 모든 컨텐츠와 데이터는 %2$s 라이선스에 따라 이용할 수 있습니다."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #: lib/action.php:1192
@@ -5423,7 +5357,7 @@ msgstr ""
 #: lib/adminpanelaction.php:98
 #, fuzzy
 msgid "You cannot make changes to this site."
-msgstr "당신은 이 사용자에게 메시지를 보낼 수 없습니다."
+msgstr "이 사이트의 이용자에 대해 권한정지 할 수 없습니다."
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
@@ -5448,20 +5382,19 @@ msgstr "명령이 아직 실행되지 않았습니다."
 #: lib/adminpanelaction.php:284
 #, fuzzy
 msgid "Unable to delete design setting."
-msgstr "트위터 환경설정을 저장할 수 없습니다."
+msgstr "디자인 설정을 저장할 수 없습니다."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 #, fuzzy
 msgid "Basic site configuration"
-msgstr "이메일 주소 확인서"
+msgstr "메일 주소 확인"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "초대"
+msgstr "사이트"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
@@ -5471,10 +5404,9 @@ msgstr "SMS 인증"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "개인적인"
+msgstr "디자인"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
@@ -5485,7 +5417,7 @@ msgstr "SMS 인증"
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
-msgstr "이용자"
+msgstr "사용자"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
@@ -5524,25 +5456,27 @@ msgstr ""
 
 #. TRANS: Form legend.
 #: lib/applicationeditform.php:137
+#, fuzzy
 msgid "Edit application"
-msgstr ""
+msgstr "응용 프로그램 수정"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:187
+#, fuzzy
 msgid "Icon for this application"
-msgstr ""
+msgstr "응용프로그램 삭제"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "140글자로 그룹이나 토픽 설명하기"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
 #, fuzzy
 msgid "Describe your application"
-msgstr "140글자로 그룹이나 토픽 설명하기"
+msgstr "응용프로그램 삭제"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
@@ -5552,9 +5486,8 @@ msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
-#, fuzzy
 msgid "Source URL"
-msgstr "소스 코드"
+msgstr "소스 코드 URL"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5628,31 +5561,32 @@ msgstr ""
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "삭제"
+msgstr "제거"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
 msgid "Attachments"
-msgstr ""
+msgstr "첨부파일"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
-msgstr ""
+msgstr "작성자"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
 #, fuzzy
 msgid "Provider"
-msgstr "프로필"
+msgstr "미리보기"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
 #: lib/attachmenttagcloudsection.php:48
+#, fuzzy
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "해당하는 첨부파일이 없습니다."
 
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 #, fuzzy
@@ -5677,9 +5611,8 @@ msgid "Command failed"
 msgstr "실행 실패"
 
 #: lib/command.php:83 lib/command.php:105
-#, fuzzy
 msgid "Notice with that id does not exist"
-msgstr "해당 id의 프로필이 없습니다."
+msgstr ""
 
 #: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
@@ -5742,7 +5675,7 @@ msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 #: lib/command.php:385
 #, fuzzy, php-format
 msgid "Could not remove user %1$s from group %2$s"
-msgstr "그룹 %s에서 %s 사용자를 제거할 수 없습니다."
+msgstr "이용자 %1$s 의 그룹 %2$s 가입에 실패했습니다."
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:418
@@ -5780,9 +5713,9 @@ msgstr ""
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+msgstr ""
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
@@ -5798,12 +5731,12 @@ msgstr "직접 메시지 보내기 오류."
 #: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
-msgstr "알림을 켤 수 없습니다."
+msgstr "자기 자신의 소식은 재전송할 수 없습니다."
 
 #: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
-msgstr "이 게시글 삭제하기"
+msgstr "이미 재전송된 소식입니다."
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5815,12 +5748,12 @@ msgstr "게시글이 등록되었습니다."
 #: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
-msgstr "통지를 저장하는데 문제가 발생했습니다."
+msgstr "사용자 세팅 오류"
 
 #: lib/command.php:562
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+msgstr ""
 
 #: lib/command.php:571
 #, fuzzy, php-format
@@ -5977,7 +5910,7 @@ msgstr ""
 #: lib/common.php:139
 #, fuzzy
 msgid "Go to the installer."
-msgstr "이 사이트 로그인"
+msgstr "이 사이트에 로그인"
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
@@ -5997,8 +5930,9 @@ msgid "Connections"
 msgstr "연결"
 
 #: lib/connectsettingsaction.php:121
+#, fuzzy
 msgid "Authorized connected applications"
-msgstr ""
+msgstr "응용프로그램 삭제"
 
 #: lib/dberroraction.php:60
 msgid "Database error"
@@ -6010,10 +5944,9 @@ msgid "Upload file"
 msgstr "올리기"
 
 #: lib/designsettings.php:109
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
-msgstr "당신의 개인적인 아바타를 업로드할 수 있습니다."
+msgstr "개인 아바타를 올릴 수 있습니다. 최대 파일 크기는 2MB입니다."
 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
@@ -6033,19 +5966,19 @@ msgstr "좋아합니다"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
 
 #: lib/feed.php:87
 msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
 
 #: lib/feed.php:89
 msgid "Atom"
-msgstr ""
+msgstr "Atom"
 
 #: lib/feed.php:91
 msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
 
 #: lib/feedlist.php:64
 msgid "Export data"
@@ -6086,19 +6019,18 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr "그룹 혹은 토픽의 홈페이지나 블로그 URL"
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "140글자로 그룹이나 토픽 설명하기"
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "140글자로 그룹이나 토픽 설명하기"
+msgstr ""
 
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "그룹의 위치, \"시/군/구, 도, 나라\""
+msgstr "그룹의 위치, \"시/군/구, 도, 국가\""
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -6110,9 +6042,8 @@ msgid "Group"
 msgstr "그룹"
 
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "차단하기"
+msgstr "차단"
 
 #: lib/groupnav.php:102
 #, fuzzy, php-format
@@ -6131,12 +6062,12 @@ msgstr "로고"
 #: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
-msgstr "%s logo 추가 혹은 수정"
+msgstr "%s 로고 추가 혹은 편집"
 
 #: lib/groupnav.php:120
 #, fuzzy, php-format
 msgid "Add or edit %s design"
-msgstr "%s logo 추가 혹은 수정"
+msgstr "%s 로고 추가 혹은 편집"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
@@ -6222,7 +6153,7 @@ msgstr "새 계정을 위한 회원가입"
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
 msgid "Email address confirmation"
-msgstr "이메일 주소 확인서"
+msgstr "메일 주소 확인"
 
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
@@ -6257,7 +6188,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6270,24 +6201,18 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s님이 귀하의 알림 메시지를 %2$s에서 듣고 있습니다.\n"
-"\t%3$s\n"
-"\n"
-"그럼 이만,%4$s.\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, fuzzy, php-format
 msgid "Bio: %s"
-msgstr ""
-"소개: %s\n"
-"\n"
+msgstr "위치: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
 #, php-format
 msgid "New email address for posting to %s"
-msgstr "%s에 포스팅 할 새로운 이메일 주소"
+msgstr "%s에 포스팅 할 새로운 메일 주소"
 
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
@@ -6375,7 +6300,7 @@ msgstr ""
 #: lib/mail.php:589
 #, fuzzy, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s님이 당신의 게시글을 좋아하는 글로 추가했습니다."
+msgstr "누군가 내 글을 좋아하는 게시글로 추가했을 때, 메일을 보냅니다."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6451,10 +6376,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "다음에서:"
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6518,7 +6442,7 @@ msgstr ""
 #: lib/mediafile.php:202 lib/mediafile.php:238
 #, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "공개 stream을 불러올 수 없습니다."
+msgstr "소스 이용자를 확인할 수 없습니다."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6536,14 +6460,13 @@ msgstr "직접 메시지 보내기"
 
 #: lib/messageform.php:146
 msgid "To"
-msgstr "에게"
+msgstr "받는 이"
 
 #: lib/messageform.php:159 lib/noticeform.php:185
 msgid "Available characters"
 msgstr "사용 가능한 글자"
 
 #: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "보내기"
@@ -6558,22 +6481,21 @@ msgid "What's up, %s?"
 msgstr "뭐하세요? %?"
 
 #: lib/noticeform.php:192
+#, fuzzy
 msgid "Attach"
-msgstr ""
+msgstr "첨부파일"
 
 #: lib/noticeform.php:196
 msgid "Attach a file"
 msgstr ""
 
 #: lib/noticeform.php:212
-#, fuzzy
 msgid "Share my location"
-msgstr "태그를 저장할 수 없습니다."
+msgstr ""
 
 #: lib/noticeform.php:215
-#, fuzzy
 msgid "Do not share my location"
-msgstr "태그를 저장할 수 없습니다."
+msgstr ""
 
 #: lib/noticeform.php:216
 msgid ""
@@ -6583,53 +6505,53 @@ msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
-#, fuzzy
 msgid "N"
-msgstr "아니오"
+msgstr "북"
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
-msgstr ""
+msgstr "남"
 
 #. TRANS: Used in coordinates as abbreviation of east
 #: lib/noticelist.php:440
 msgid "E"
-msgstr ""
+msgstr "동"
 
 #. TRANS: Used in coordinates as abbreviation of west
 #: lib/noticelist.php:442
 msgid "W"
-msgstr ""
+msgstr "서"
 
 #: lib/noticelist.php:444
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:453
+#, fuzzy
 msgid "at"
-msgstr ""
+msgstr "경로"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 #, fuzzy
 msgid "in context"
 msgstr "내용이 없습니다!"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 #, fuzzy
 msgid "Repeated by"
-msgstr "생성"
+msgstr "재전송됨"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "이 게시글에 대해 답장하기"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 #, fuzzy
 msgid "Notice repeated"
 msgstr "게시글이 등록되었습니다."
@@ -6673,7 +6595,7 @@ msgstr "예약 구독을 추가 할 수 없습니다."
 
 #: lib/personalgroupnav.php:99
 msgid "Personal"
-msgstr "개인적인"
+msgstr "개인"
 
 #: lib/personalgroupnav.php:104
 msgid "Replies"
@@ -6689,7 +6611,7 @@ msgstr "받은 쪽지함"
 
 #: lib/personalgroupnav.php:126
 msgid "Your incoming messages"
-msgstr "당신의 받은 메시지들"
+msgstr "받은 메시지"
 
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
@@ -6697,7 +6619,7 @@ msgstr "보낸 쪽지함"
 
 #: lib/personalgroupnav.php:131
 msgid "Your sent messages"
-msgstr "당신의 보낸 메시지들"
+msgstr "보낸 메시지"
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
@@ -6726,9 +6648,8 @@ msgid "All subscribers"
 msgstr "모든 구독자"
 
 #: lib/profileaction.php:191
-#, fuzzy
 msgid "User ID"
-msgstr "이용자"
+msgstr "이용자 ID"
 
 #: lib/profileaction.php:196
 msgid "Member since"
@@ -6737,7 +6658,7 @@ msgstr "가입한 때"
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
-msgstr ""
+msgstr "하루 평균"
 
 #: lib/profileaction.php:264
 msgid "All groups"
@@ -6770,7 +6691,7 @@ msgstr "인기있는"
 #: lib/redirectingaction.php:95
 #, fuzzy
 msgid "No return-to arguments."
-msgstr "id 인자가 없습니다."
+msgstr "첨부문서 없음"
 
 #: lib/repeatform.php:107
 #, fuzzy
@@ -6779,7 +6700,7 @@ msgstr "이 게시글에 대해 답장하기"
 
 #: lib/repeatform.php:132
 msgid "Yes"
-msgstr "네, 맞습니다."
+msgstr "예"
 
 #: lib/repeatform.php:132
 #, fuzzy
@@ -6787,9 +6708,9 @@ msgid "Repeat this notice"
 msgstr "이 게시글에 대해 답장하기"
 
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "이 그룹의 회원리스트"
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6808,7 +6729,7 @@ msgstr "이 사용자를 차단해제합니다."
 #: lib/searchaction.php:120
 #, fuzzy
 msgid "Search site"
-msgstr "검색"
+msgstr "검색 도움말"
 
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
@@ -6819,9 +6740,8 @@ msgid "Search"
 msgstr "검색"
 
 #: lib/searchaction.php:162
-#, fuzzy
 msgid "Search help"
-msgstr "검색"
+msgstr "검색 도움말"
 
 #: lib/searchgroupnav.php:80
 msgid "People"
@@ -6845,7 +6765,7 @@ msgstr "제목없는 섹션"
 
 #: lib/section.php:106
 msgid "More..."
-msgstr ""
+msgstr "더 보기..."
 
 #: lib/silenceform.php:67
 #, fuzzy
@@ -6855,7 +6775,7 @@ msgstr "사이트 공지"
 #: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
-msgstr "이 사용자 차단하기"
+msgstr "이 사용자 삭제"
 
 #: lib/subgroupnav.php:83
 #, php-format
@@ -6870,7 +6790,7 @@ msgstr "%s에 의해 구독되는 사람들"
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
-msgstr "%s 그룹들은  의 멤버입니다."
+msgstr "%s 사용자가 멤버인 그룹"
 
 #: lib/subgroupnav.php:105
 msgid "Invite"
@@ -6937,7 +6857,7 @@ msgstr ""
 #: lib/themeuploader.php:234
 #, fuzzy
 msgid "Error opening theme archive."
-msgstr "리모트 프로필 업데이트 오류"
+msgstr "차단 제거 에러!"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -6990,11 +6910,11 @@ msgstr ""
 #: lib/userprofile.php:263
 #, fuzzy
 msgid "Edit profile settings"
-msgstr "프로필 세팅"
+msgstr "프로필 설정"
 
 #: lib/userprofile.php:264
 msgid "Edit"
-msgstr ""
+msgstr "편집"
 
 #: lib/userprofile.php:287
 msgid "Send a direct message to this user"
@@ -7014,7 +6934,6 @@ msgid "User role"
 msgstr "이용자 프로필"
 
 #: lib/userprofile.php:366
-#, fuzzy
 msgctxt "role"
 msgid "Administrator"
 msgstr "관리자"
@@ -7089,6 +7008,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 
 #: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "당신이 보낸 메시지가 너무 길어요. 최대 140글자까지입니다."
+msgstr ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 551c61dce..8c4981fbe 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:45+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:44+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -792,7 +792,7 @@ msgid "Preview"
 msgstr "Преглед"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Бриши"
 
@@ -1074,7 +1074,7 @@ msgid "Do not delete this notice"
 msgstr "Не ја бриши оваа забелешка"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Бриши ја оваа забелешка"
 
@@ -3510,7 +3510,7 @@ msgstr "Не можете да повторувате сопствена заб
 msgid "You already repeated that notice."
 msgstr "Веќе ја имате повторено таа забелешка."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4983,7 +4983,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5377,13 +5377,13 @@ msgstr "Прелом на страници"
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
 msgid "After"
-msgstr "По"
+msgstr "Следно"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
 msgid "Before"
-msgstr "Пред"
+msgstr "Претходно"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -6547,7 +6547,7 @@ msgstr ""
 "впуштите во разговор со други корисници. Луѓето можат да ви испраќаат пораки "
 "што ќе можете да ги видите само Вие."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "од"
 
@@ -6709,23 +6709,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "во"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "во контекст"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Повторено од"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Одговори на забелешкава"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Одговор"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Забелешката е повторена"
 
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index 8c432b7b1..b704f8aef 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:50+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:58+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -804,7 +804,7 @@ msgid "Preview"
 msgstr "Voorvertoning"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -1086,7 +1086,7 @@ msgid "Do not delete this notice"
 msgstr "Deze mededeling niet verwijderen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
@@ -3537,7 +3537,7 @@ msgstr "U kunt uw eigen mededeling niet herhalen."
 msgid "You already repeated that notice."
 msgstr "U hent die mededeling al herhaald."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Herhaald"
 
@@ -5026,7 +5026,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6599,7 +6599,7 @@ 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."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "van"
 
@@ -6697,7 +6697,7 @@ msgstr "Beschikbare tekens"
 #: lib/messageform.php:178 lib/noticeform.php:236
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "OK"
+msgstr "Verzenden"
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
@@ -6761,23 +6761,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "op"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "in context"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Herhaald door"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Op deze mededeling antwoorden"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Antwoorden"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Mededeling herhaald"
 
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 81c5a97c4..9fb531ff3 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: 2010-08-07 16:23+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+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"
@@ -763,7 +763,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr ""
 
@@ -1036,7 +1036,7 @@ msgid "Do not delete this notice"
 msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr ""
 
@@ -3310,7 +3310,7 @@ msgstr ""
 msgid "You already repeated that notice."
 msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr ""
 
@@ -4679,7 +4679,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -6071,7 +6071,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr ""
 
@@ -6225,23 +6225,23 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr ""
 
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 8e1e37ced..e425f6c62 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:05+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:13:19+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -792,7 +792,7 @@ msgid "Preview"
 msgstr "Перегляд"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Видалити"
 
@@ -1071,7 +1071,7 @@ msgid "Do not delete this notice"
 msgstr "Не видаляти цей допис"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Видалити допис"
 
@@ -3494,7 +3494,7 @@ msgstr "Ви не можете повторювати свої власні до
 msgid "You already repeated that notice."
 msgstr "Ви вже повторили цей допис."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4960,7 +4960,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -6517,7 +6517,7 @@ msgstr ""
 "повідомлення аби долучити користувачів до розмови. Такі повідомлення бачите "
 "лише Ви."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "від"
 
@@ -6676,23 +6676,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "в"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "в контексті"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Відповісти на цей допис"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Відповісти"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Допис повторили"
 
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 9de9d8e75..0a982b2e4 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -2,6 +2,7 @@
 #
 # Author@translatewiki.net: Chenxiaoqino
 # Author@translatewiki.net: Shizhao
+# Author@translatewiki.net: Sweeite012f
 # --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
@@ -11,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:08+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:13:25+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -71,9 +72,8 @@ msgstr "禁止新用户注册"
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "已关闭"
+msgstr ""
 
 #. TRANS: Title / tooltip for button to save access settings in site admin panel
 #: actions/accessadminpanel.php:202
@@ -98,7 +98,7 @@ msgstr "保存"
 #: actions/showfavorites.php:138 actions/tag.php:52
 #, fuzzy
 msgid "No such page."
-msgstr "没有该页面"
+msgstr "未找到此消息。"
 
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
@@ -296,9 +296,8 @@ msgid "Could not update your design."
 msgstr "无法更新用户。"
 
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "无法更新用户。"
+msgstr ""
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
@@ -335,7 +334,7 @@ msgstr "消息没有正文！"
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
 #, fuzzy, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
+msgstr "你可以给你的组上载一个logo图。"
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -371,7 +370,7 @@ msgstr "无法删除收藏。"
 #: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "无法订阅用户：未找到。"
+msgstr "无法订阅用户：%s 已在订阅列表中。"
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -381,27 +380,25 @@ msgstr "无法订阅用户：%s 已在订阅列表中。"
 #: actions/apifriendshipsdestroy.php:109
 #, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "无法订阅用户：未找到。"
+msgstr "无法订阅用户：%s 已在订阅列表中。"
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "无法更新用户。"
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "必须提供两个用户帐号或昵称。"
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 #, fuzzy
 msgid "Could not determine source user."
-msgstr "无法获取收藏的通告。"
+msgstr "无法更新用户。"
 
 #: actions/apifriendshipsshow.php:142
 #, fuzzy
 msgid "Could not find target user."
-msgstr "找不到任何信息。"
+msgstr "无法更新用户。"
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -438,7 +435,7 @@ msgstr "全名过长(不能超过 255 个字符)。"
 #: actions/newapplication.php:172
 #, fuzzy, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "描述过长(不能超过%d 个字符)。"
+msgstr "位置过长(不能超过255个字符)。"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -455,13 +452,13 @@ msgstr "太多化名了！最多%d 个。"
 #: actions/apigroupcreate.php:267
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "主页'%s'不正确"
+msgstr "电子邮件地址 %s 不正确"
 
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, fuzzy, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "昵称%s已被使用，换一个吧。"
+msgstr "昵称已被使用，换一个吧。"
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -486,7 +483,7 @@ msgstr ""
 #: actions/apigroupjoin.php:139 actions/joingroup.php:134
 #, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "无法把 %s 用户添加到 %s 组"
+msgstr "无法更新组"
 
 #: actions/apigroupleave.php:115
 #, fuzzy
@@ -496,7 +493,7 @@ msgstr "您未告知此个人信息"
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
 #, fuzzy, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "无法订阅用户：未找到。"
+msgstr "无法创建组。"
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -523,9 +520,8 @@ msgid "groups on %s"
 msgstr "组动作"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "上传"
+msgstr "上传失败"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -560,14 +556,12 @@ msgid "Invalid nickname / password!"
 msgstr "用户名或密码不正确。"
 
 #: actions/apioauthauthorize.php:159
-#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr "保存用户设置时出错。"
+msgstr ""
 
 #: actions/apioauthauthorize.php:185
-#, fuzzy
 msgid "Database error inserting OAuth application user."
-msgstr "添加标签时数据库出错：%s"
+msgstr ""
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -662,12 +656,11 @@ msgstr "无法开启通告。"
 #: actions/apistatusesretweet.php:91
 #, fuzzy
 msgid "Already repeated that notice."
-msgstr "删除通告"
+msgstr "无法删除通告。"
 
 #: actions/apistatusesshow.php:139
-#, fuzzy
 msgid "Status deleted."
-msgstr "头像已更新。"
+msgstr ""
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -681,12 +674,12 @@ msgstr ""
 #: lib/mailhandler.php:60
 #, fuzzy, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
+msgstr "你可以给你的组上载一个logo图。"
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
-msgstr "未找到"
+msgstr "小组未找到。"
 
 #: actions/apistatusesupdate.php:306 actions/newnotice.php:178
 #, php-format
@@ -701,17 +694,17 @@ msgstr "不支持这种图像格式。"
 #: actions/apitimelinefavorites.php:110
 #, fuzzy, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s 的收藏 / %s"
+msgstr "%1$s 的 %2$s 状态"
 
 #: actions/apitimelinefavorites.php:119
 #, fuzzy, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s 收藏了 %s 的 %s 通告。"
+msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
 
 #: actions/apitimelinementions.php:118
 #, fuzzy, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / 回复 %2$s 的消息"
+msgstr "%1$s 的 %2$s 状态"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -755,7 +748,7 @@ msgstr "API 方法尚未实现。"
 #: actions/attachment.php:73
 #, fuzzy
 msgid "No such attachment."
-msgstr "没有这份文档。"
+msgstr "没有这份通告。"
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -781,14 +774,14 @@ msgstr "头像"
 #: actions/avatarsettings.php:78
 #, fuzzy, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "您可以在这里上传个人头像。"
+msgstr "你可以给你的组上载一个logo图。"
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
 #, fuzzy
 msgid "User without matching profile."
-msgstr "找不到匹配的用户。"
+msgstr "用户没有个人信息。"
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -806,10 +799,10 @@ msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 #, fuzzy
 msgid "Delete"
-msgstr "删除"
+msgstr "删除通告"
 
 #: actions/avatarsettings.php:166 actions/grouplogo.php:236
 msgid "Upload"
@@ -822,7 +815,7 @@ msgstr "剪裁"
 #: actions/avatarsettings.php:305
 #, fuzzy
 msgid "No file uploaded."
-msgstr "没有收件人。"
+msgstr "部分上传。"
 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
@@ -848,12 +841,12 @@ msgstr "头像已更新。"
 #: actions/block.php:69
 #, fuzzy
 msgid "You already blocked that user."
-msgstr "您已成功阻止该用户："
+msgstr "您已订阅这些用户："
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 #, fuzzy
 msgid "Block user"
-msgstr "阻止用户"
+msgstr "阻止用户失败。"
 
 #: actions/block.php:138
 msgid ""
@@ -870,17 +863,15 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "否"
+msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
 msgid "Do not block this user"
-msgstr "取消阻止次用户"
+msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -899,7 +890,7 @@ msgstr "是"
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
-msgstr "阻止该用户"
+msgstr "呼叫这个用户"
 
 #: actions/block.php:187
 msgid "Failed to save block information."
@@ -920,14 +911,14 @@ msgid "No such group."
 msgstr "没有这个组。"
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "用户没有个人信息。"
+msgstr ""
 
 #: actions/blockedfromgroup.php:100
 #, fuzzy, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s 及好友"
+msgstr "%1$s 和好友，第%2$d页"
 
 #: actions/blockedfromgroup.php:115
 #, fuzzy
@@ -946,13 +937,13 @@ msgstr "取消阻止"
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:80
 #, fuzzy
 msgid "Unblock this user"
-msgstr "取消阻止次用户"
+msgstr "取消阻止用户失败。"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
 #, fuzzy, php-format
 msgid "Post to %s"
-msgstr "相片"
+msgstr "%s 的回复"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -968,9 +959,9 @@ msgstr "此确认码不适用！"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "不可识别的地址类型 %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -1001,7 +992,7 @@ msgstr "无法删除电子邮件确认。"
 #: actions/confirmaddress.php:146
 #, fuzzy
 msgid "Confirm address"
-msgstr "确认地址"
+msgstr "已确认的电子邮件。"
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -1026,7 +1017,7 @@ msgstr "您必须登录才能创建小组。"
 #: actions/deleteapplication.php:71
 #, fuzzy
 msgid "Application not found."
-msgstr "通告没有关联个人信息"
+msgstr "未找到确认码。"
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
@@ -1042,9 +1033,8 @@ msgid "There was a problem with your session token."
 msgstr "会话标识有问题，请重试。"
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
 msgid "Delete application"
-msgstr "没有这份通告。"
+msgstr ""
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1063,9 +1053,8 @@ msgstr "无法删除通告。"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
-#, fuzzy
 msgid "Delete this application"
-msgstr "删除通告"
+msgstr ""
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1083,11 +1072,10 @@ msgid "Can't delete this notice."
 msgstr "无法删除通告。"
 
 #: actions/deletenotice.php:103
-#, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr "您选择了永久删除通告。这样做是无法恢复的。"
+msgstr ""
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -1104,7 +1092,7 @@ msgid "Do not delete this notice"
 msgstr "无法删除通告。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 #, fuzzy
 msgid "Delete this notice"
 msgstr "删除通告"
@@ -1122,19 +1110,22 @@ msgstr "您不能删除其他用户的状态。"
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 #, fuzzy
 msgid "Delete user"
-msgstr "删除"
+msgstr "删除通告"
 
 #: actions/deleteuser.php:136
+#, fuzzy
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
+"你确定要删除这个组件吗？这将从数据库中清除有关这个组件的所有数据，包括所有的"
+"用户联系。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
-msgstr "删除通告"
+msgstr "呼叫这个用户"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -1153,19 +1144,18 @@ msgid "Invalid logo URL."
 msgstr "大小不正确。"
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #: actions/designadminpanel.php:426
 #, fuzzy
 msgid "Change logo"
-msgstr "修改密码"
+msgstr "修改"
 
 #: actions/designadminpanel.php:431
-#, fuzzy
 msgid "Site logo"
-msgstr "邀请"
+msgstr ""
 
 #: actions/designadminpanel.php:443
 #, fuzzy
@@ -1173,19 +1163,16 @@ msgid "Change theme"
 msgstr "修改"
 
 #: actions/designadminpanel.php:460
-#, fuzzy
 msgid "Site theme"
-msgstr "新通告"
+msgstr ""
 
 #: actions/designadminpanel.php:461
-#, fuzzy
 msgid "Theme for the site."
-msgstr "登出本站"
+msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "新通告"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1295,12 +1282,11 @@ msgstr "加入收藏"
 #: actions/doc.php:158
 #, fuzzy, php-format
 msgid "No such document \"%s\""
-msgstr "没有这份文档。"
+msgstr "没有这份通告。"
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "其他选项"
+msgstr ""
 
 #: actions/editapplication.php:66
 #, fuzzy
@@ -1336,7 +1322,7 @@ msgstr "昵称已被使用，换一个吧。"
 #: actions/editapplication.php:186 actions/newapplication.php:168
 #, fuzzy
 msgid "Description is required."
-msgstr "描述"
+msgstr "订阅被拒绝"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
@@ -1386,7 +1372,7 @@ msgstr "您必须登录才能创建小组。"
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 #, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "只有admin才能编辑这个组"
+msgstr "您必须登录才能创建小组。"
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
@@ -1395,12 +1381,12 @@ msgstr "使用这个表单来编辑组"
 #: actions/editgroup.php:205 actions/newgroup.php:145
 #, fuzzy, php-format
 msgid "description is too long (max %d chars)."
-msgstr "描述过长(不能超过140字符)。"
+msgstr "位置过长(不能超过255个字符)。"
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "主页'%s'不正确"
+msgstr "电子邮件地址 %s 不正确"
 
 #: actions/editgroup.php:258
 msgid "Could not update group."
@@ -1420,7 +1406,7 @@ msgstr "选项已保存。"
 #: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
-msgstr "电子邮件设置"
+msgstr "个人设置"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1452,7 +1438,7 @@ msgstr "已确认的电子邮件。"
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "移除"
+msgstr "恢复"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1483,10 +1469,9 @@ msgstr "电子邮件，类似 \"UserName@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "添加"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1509,16 +1494,15 @@ msgstr "生成新的电子邮件地址用于发布信息；取消旧的。"
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "新建"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
 #, fuzzy
 msgid "Email preferences"
-msgstr "首选项"
+msgstr "电子邮件地址"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1560,7 +1544,7 @@ msgstr "公开电子邮件的 MicroID。"
 #: actions/emailsettings.php:334
 #, fuzzy
 msgid "Email preferences saved."
-msgstr "同步选项已保存。"
+msgstr "首选项已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
@@ -1623,7 +1607,7 @@ msgstr "即时通讯帐号错误。"
 #: actions/emailsettings.php:438
 #, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "已取消确认。"
+msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1635,7 +1619,7 @@ msgstr "这是他人的电子邮件。"
 #: actions/emailsettings.php:479
 #, fuzzy
 msgid "The email address was removed."
-msgstr "地址被移除。"
+msgstr "发布用的电子邮件被移除。"
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1665,7 +1649,7 @@ msgstr "已收藏此通告！"
 #: actions/favor.php:92 lib/disfavorform.php:140
 #, fuzzy
 msgid "Disfavor favorite"
-msgstr "取消收藏"
+msgstr "加入收藏"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
@@ -1676,12 +1660,11 @@ msgstr "没有这份通告。"
 #: actions/favorited.php:67
 #, fuzzy, php-format
 msgid "Popular notices, page %d"
-msgstr "没有这份通告。"
+msgstr "组，第 %d 页"
 
 #: actions/favorited.php:79
-#, fuzzy
 msgid "The most popular notices on the site right now."
-msgstr "显示上周以来最流行的标签"
+msgstr ""
 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1722,38 +1705,35 @@ msgid "Featured users, page %d"
 msgstr "推荐用户，第 %d 页"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s"
-msgstr "%s 优秀用户摘选"
+msgstr ""
 
 #: actions/file.php:34
 #, fuzzy
 msgid "No notice ID."
-msgstr "新通告"
+msgstr "没有这份通告。"
 
 #: actions/file.php:38
 #, fuzzy
 msgid "No notice."
-msgstr "新通告"
+msgstr "没有这份通告。"
 
 #: actions/file.php:42
-#, fuzzy
 msgid "No attachments."
-msgstr "没有这份文档。"
+msgstr ""
 
 #: actions/file.php:51
-#, fuzzy
 msgid "No uploaded attachments."
-msgstr "没有这份文档。"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "未预料的响应！"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "要查看的用户不存在。"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1766,17 +1746,15 @@ msgstr "那个用户阻止了你的订阅。"
 #: actions/finishremotesubscribe.php:110
 #, fuzzy
 msgid "You are not authorized."
-msgstr "未认证。"
+msgstr "订阅已确认"
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "无法将请求标记转换为访问令牌。"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "此OMB协议版本无效。"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:138
 #, fuzzy
@@ -1791,7 +1769,7 @@ msgstr "没有这份通告。"
 #: actions/getfile.php:83
 #, fuzzy
 msgid "Cannot read file."
-msgstr "没有这份通告。"
+msgstr "无法创建收藏。"
 
 #: actions/grantrole.php:62 actions/revokerole.php:62
 #, fuzzy
@@ -1805,7 +1783,7 @@ msgstr ""
 #: actions/grantrole.php:75
 #, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "无法向此用户发送消息。"
+msgstr "在这个网站你被禁止发布消息。"
 
 #: actions/grantrole.php:82
 #, fuzzy
@@ -1837,9 +1815,8 @@ msgid "Only an admin can block group members."
 msgstr ""
 
 #: actions/groupblock.php:95
-#, fuzzy
 msgid "User is already blocked from group."
-msgstr "用户没有个人信息。"
+msgstr ""
 
 #: actions/groupblock.php:100
 #, fuzzy
@@ -1849,7 +1826,7 @@ msgstr "您未告知此个人信息"
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 #, fuzzy
 msgid "Block user from group"
-msgstr "阻止用户"
+msgstr "阻止用户失败。"
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1878,7 +1855,7 @@ msgstr ""
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 #, fuzzy
 msgid "No ID."
-msgstr "没有ID"
+msgstr "没有 Jabber ID。"
 
 #: actions/groupdesignsettings.php:68
 #, fuzzy
@@ -1905,7 +1882,7 @@ msgstr "无法更新用户。"
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 #, fuzzy
 msgid "Design preferences saved."
-msgstr "同步选项已保存。"
+msgstr "首选项已保存。"
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
@@ -1929,7 +1906,7 @@ msgstr "logo已更新。"
 #: actions/grouplogo.php:401
 #, fuzzy
 msgid "Failed updating logo."
-msgstr "更新logo失败。"
+msgstr "更新头像失败。"
 
 #: actions/groupmembers.php:100 lib/groupnav.php:92
 #, php-format
@@ -1939,7 +1916,7 @@ msgstr "%s 组成员"
 #: actions/groupmembers.php:103
 #, fuzzy, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "%s 组成员, 第 %d 页"
+msgstr "%s 组成员"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1954,9 +1931,8 @@ msgid "Block"
 msgstr "阻止"
 
 #: actions/groupmembers.php:487
-#, fuzzy
 msgid "Make user an admin of the group"
-msgstr "只有admin才能编辑这个组"
+msgstr ""
 
 #: actions/groupmembers.php:519
 #, fuzzy
@@ -2005,7 +1981,7 @@ msgstr ""
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
-msgstr "创建新组"
+msgstr "使用此表格创建组。"
 
 #: actions/groupsearch.php:52
 #, fuzzy, php-format
@@ -2024,7 +2000,7 @@ msgstr "组检索"
 #: actions/peoplesearch.php:83
 #, fuzzy
 msgid "No results."
-msgstr "没有结果"
+msgstr "执行结果"
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2047,18 +2023,17 @@ msgstr ""
 #: actions/groupunblock.php:95
 #, fuzzy
 msgid "User is not blocked from group."
-msgstr "用户没有个人信息。"
+msgstr "使用这个表单来编辑组"
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
 msgid "Error removing the block."
-msgstr "保存用户时出错。"
+msgstr ""
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
-msgstr "IM 设置"
+msgstr "头像设置"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2074,16 +2049,15 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
 #, fuzzy
 msgid "IM address"
-msgstr "IM 帐号"
+msgstr "电子邮件地址"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2115,7 +2089,7 @@ msgstr ""
 #: actions/imsettings.php:155
 #, fuzzy
 msgid "IM preferences"
-msgstr "首选项"
+msgstr "首选项已保存。"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2191,7 +2165,7 @@ msgstr "无法删除电子邮件确认。"
 #: actions/imsettings.php:402
 #, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "已取消确认。"
+msgstr "没有验证码"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2203,7 +2177,7 @@ msgstr "这不是您的Jabber帐号。"
 #: actions/imsettings.php:447
 #, fuzzy
 msgid "The IM address was removed."
-msgstr "地址被移除。"
+msgstr "发布用的电子邮件被移除。"
 
 #: actions/inbox.php:59
 #, fuzzy, php-format
@@ -2226,7 +2200,7 @@ msgstr ""
 #: actions/invite.php:41
 #, fuzzy, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "您必须登录才能创建小组。"
 
 #: actions/invite.php:72
 #, php-format
@@ -2290,10 +2264,9 @@ msgstr "在邀请中加几句话(可选)。"
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "发送"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2356,7 +2329,7 @@ msgstr ""
 #: actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
-msgstr "您必须登录才能加入组。"
+msgstr "您必须登录才能创建小组。"
 
 #: actions/joingroup.php:88 actions/leavegroup.php:88
 #, fuzzy
@@ -2366,26 +2339,26 @@ msgstr "没有昵称。"
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s joined group %2$s"
-msgstr "%s 加入 %s 组"
+msgstr ""
 
 #: actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "您必须登录才能创建小组。"
 
 #: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
-msgstr "您未告知此个人信息"
+msgstr "您已经是该组成员"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s 离开群 %s"
+msgstr "%1$s 的 %2$s 状态"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2396,9 +2369,8 @@ msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
 #: actions/login.php:154 actions/otp.php:120
-#, fuzzy
 msgid "Error setting user. You are probably not authorized."
-msgstr "未认证。"
+msgstr ""
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -2429,44 +2401,40 @@ msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 #: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
-msgstr "输入用户名和密码以登录。"
+msgstr "用户名或密码不正确。"
 
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, "
-"或使用 [OpenID](%%action.openidlogin%%). "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "用户没有个人信息。"
+msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "无法订阅用户：未找到。"
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "只有admin才能编辑这个组"
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "没有当前状态"
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "没有这份通告。"
+msgstr ""
 
 #: actions/newapplication.php:64
 #, fuzzy
@@ -2520,7 +2488,7 @@ msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
 #: actions/newmessage.php:181
 #, fuzzy
 msgid "Message sent"
-msgstr "新消息"
+msgstr "消息没有正文！"
 
 #: actions/newmessage.php:185
 #, fuzzy, php-format
@@ -2555,7 +2523,7 @@ msgstr "搜索文本"
 #: actions/noticesearch.php:91
 #, fuzzy, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "搜索有关\"%s\"的消息"
+msgstr "来自 %1$s 的 %2$s 消息"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2572,20 +2540,19 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "%2$s 上 %1$s 的更新！"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
 #, fuzzy, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "所有匹配搜索条件\"%s\"的消息"
+msgstr "%2$s 上 %1$s 的更新！"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
+msgstr ""
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2623,9 +2590,8 @@ msgid "You have allowed the following applications to access you account."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
-#, fuzzy
 msgid "You are not a user of that application."
-msgstr "您未告知此个人信息"
+msgstr ""
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
@@ -2643,7 +2609,7 @@ msgstr ""
 #: actions/oembed.php:80 actions/shownotice.php:100
 #, fuzzy
 msgid "Notice has no profile."
-msgstr "通告没有关联个人信息"
+msgstr "用户没有个人信息。"
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2652,9 +2618,9 @@ msgstr "%1$s 的 %2$s 状态"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "连接"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2679,7 +2645,7 @@ msgstr "搜索通告"
 #: actions/othersettings.php:60
 #, fuzzy
 msgid "Other settings"
-msgstr "Twitter 设置"
+msgstr "头像设置"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2709,7 +2675,7 @@ msgstr ""
 #: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL缩短服务超长(最多50个字符)。"
+msgstr "语言过长(不能超过50个字符)。"
 
 #: actions/otp.php:69
 #, fuzzy
@@ -2724,12 +2690,11 @@ msgstr "没有收件人。"
 #: actions/otp.php:90
 #, fuzzy
 msgid "No login token requested."
-msgstr "服务器没有返回个人信息URL。"
+msgstr "未收到认证请求！"
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "通告内容不正确"
+msgstr ""
 
 #: actions/otp.php:104
 #, fuzzy
@@ -2823,24 +2788,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2865,9 +2830,8 @@ msgid "Path"
 msgstr ""
 
 #: actions/pathsadminpanel.php:242
-#, fuzzy
 msgid "Site path"
-msgstr "新通告"
+msgstr ""
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
@@ -2917,9 +2881,8 @@ msgid "Avatar path"
 msgstr "头像已更新。"
 
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "头像已更新。"
+msgstr ""
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
@@ -2965,18 +2928,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "恢复"
+msgstr ""
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "新通告"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2994,17 +2955,17 @@ msgstr "搜索用户"
 #: actions/peopletag.php:68
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s."
-msgstr "不是有效的电子邮件"
+msgstr "不是有效的电子邮件。"
 
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "用户自加标签 %s - 第 %d 页"
+msgstr ""
 
 #: actions/postnotice.php:95
 #, fuzzy
 msgid "Invalid notice content."
-msgstr "通告内容不正确"
+msgstr "大小不正确。"
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3023,7 +2984,7 @@ msgstr "在这里更新个人信息，让大家对您了解得更多。"
 #: actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
-msgstr "未知的帐号"
+msgstr "个人设置"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -3046,14 +3007,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "您的主页、博客或在其他站点的URL"
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3109,7 +3069,7 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器
 #: actions/profilesettings.php:228 actions/register.php:230
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "自述过长(不能超过140字符)。"
+msgstr "位置过长(不能超过255个字符)。"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3122,7 +3082,7 @@ msgstr "语言过长(不能超过50个字符)。"
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "主页'%s'不正确"
+msgstr "电子邮件地址 %s 不正确"
 
 #: actions/profilesettings.php:306
 msgid "Couldn't update user for autosubscribe."
@@ -3167,26 +3127,23 @@ msgid "Public timeline"
 msgstr "公开的时间表"
 
 #: actions/public.php:160
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "公开的聚合"
+msgstr ""
 
 #: actions/public.php:164
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "公开的聚合"
+msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "公开的聚合"
+msgstr ""
 
 #: actions/public.php:188
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
-msgstr ""
+msgstr "这是 %s 和好友的时间线，但是没有任何人发布内容。"
 
 #: actions/public.php:191
 msgid "Be the first to post!"
@@ -3208,19 +3165,17 @@ msgid ""
 msgstr ""
 
 #: actions/public.php:247
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
-"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) 服务"
 
 #: actions/publictagcloud.php:57
 #, fuzzy
 msgid "Public tag cloud"
-msgstr "公开的聚合"
+msgstr "标签云聚集"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3276,22 +3231,25 @@ msgid "Could not update user with confirmed email address."
 msgstr "无法更新已确认的电子邮件。"
 
 #: actions/recoverpassword.php:152
+#, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
-msgstr ""
+msgstr "恢复密码的指示已被发送到您的注册邮箱。"
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
 #: actions/recoverpassword.php:188
+#, fuzzy
 msgid "Password recovery"
-msgstr ""
+msgstr "请求恢复密码"
 
 #: actions/recoverpassword.php:191
+#, fuzzy
 msgid "Nickname or email address"
-msgstr ""
+msgstr "输入昵称或电子邮件。"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -3455,14 +3413,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
+msgstr ""
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3479,18 +3437,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"恭喜， %s! 欢迎来到 %%%%site.name%%%%. 这里，你需要\n"
-"\n"
-"* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
-"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消"
-"息平台发布信息。\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的"
-"朋友。 \n"
-"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关"
-"于你的情况。 \n"
-"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
-"\n"
-"感谢您的注册，希望您喜欢这个服务。"
 
 #: actions/register.php:607
 msgid ""
@@ -3544,19 +3490,16 @@ msgid "Invalid profile URL (bad format)"
 msgstr "个人信息URL不正确(格式错误)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "不是有效的个人信息URL(没有YADIS数据)。"
+msgstr ""
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
-msgstr "那是一个本地资料！需要登录才能订阅。"
+msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "无法获得一份请求标记。"
+msgstr ""
 
 #: actions/repeat.php:57
 #, fuzzy
@@ -3574,19 +3517,17 @@ msgid "You can't repeat your own notice."
 msgstr "您必须同意此授权方可注册。"
 
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
-msgstr "您已成功阻止该用户："
+msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 #, fuzzy
 msgid "Repeated"
-msgstr "创建"
+msgstr "特征"
 
 #: actions/repeat.php:119
-#, fuzzy
 msgid "Repeated!"
-msgstr "创建"
+msgstr ""
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3597,22 +3538,22 @@ msgstr "%s 的回复"
 #: actions/replies.php:128
 #, fuzzy, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "发送给 %1$s 的 %2$s 消息"
+msgstr "%s 的回复"
 
 #: actions/replies.php:145
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 1.0)"
 
 #: actions/replies.php:152
 #, fuzzy, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 2.0)"
 
 #: actions/replies.php:159
 #, fuzzy, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(Atom)"
 
 #: actions/replies.php:199
 #, fuzzy, php-format
@@ -3643,17 +3584,16 @@ msgstr "发送给 %1$s 的 %2$s 消息"
 #: actions/revokerole.php:75
 #, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "无法向此用户发送消息。"
+msgstr "在这个网站你被禁止发布消息。"
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "找不到匹配的用户。"
+msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
 #, fuzzy
 msgid "StatusNet"
-msgstr "头像已更新。"
+msgstr "统计"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 #, fuzzy
@@ -3661,9 +3601,8 @@ msgid "You cannot sandbox users on this site."
 msgstr "无法向此用户发送消息。"
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "用户没有个人信息。"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3700,12 +3639,11 @@ msgstr "头像设置"
 #: actions/showapplication.php:82
 #, fuzzy
 msgid "You must be logged in to view an application."
-msgstr "您必须登录才能邀请其他人使用 %s"
+msgstr "您必须登录才能创建小组。"
 
 #: actions/showapplication.php:157
-#, fuzzy
 msgid "Application profile"
-msgstr "通告没有关联个人信息"
+msgstr ""
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
@@ -3730,7 +3668,7 @@ msgstr "分页"
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
-msgstr "描述"
+msgstr "订阅"
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3842,12 +3780,12 @@ msgstr "%s 组"
 #: actions/showgroup.php:84
 #, fuzzy, php-format
 msgid "%1$s group, page %2$d"
-msgstr "%s 组成员, 第 %d 页"
+msgstr "组，第 %d 页"
 
 #: actions/showgroup.php:227
 #, fuzzy
 msgid "Group profile"
-msgstr "组资料"
+msgstr "组logo"
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
@@ -3871,17 +3809,17 @@ msgstr "组动作"
 #: actions/showgroup.php:338
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 1.0)"
 
 #: actions/showgroup.php:344
 #, fuzzy, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 2.0)"
 
 #: actions/showgroup.php:350
 #, fuzzy, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(Atom)"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3891,7 +3829,7 @@ msgstr "%s 的发件箱"
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 #, fuzzy
 msgid "Members"
-msgstr "注册于"
+msgstr "用户始于"
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
@@ -3906,7 +3844,7 @@ msgstr "所有成员"
 #: actions/showgroup.php:439
 #, fuzzy
 msgid "Created"
-msgstr "创建"
+msgstr "特征"
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3919,15 +3857,13 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:461
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showgroup.php:489
 #, fuzzy
@@ -3965,27 +3901,27 @@ msgstr "带 %s 标签的通告"
 #: actions/showstream.php:79
 #, fuzzy, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s 及好友"
+msgstr "%1$s 和好友，第%2$d页"
 
 #: actions/showstream.php:122
 #, fuzzy, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 1.0)"
 
 #: actions/showstream.php:129
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 1.0)"
 
 #: actions/showstream.php:136
 #, fuzzy, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(RSS 2.0)"
 
 #: actions/showstream.php:143
 #, fuzzy, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合(Atom)"
 
 #: actions/showstream.php:148
 #, fuzzy, php-format
@@ -4020,14 +3956,12 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]"
-"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showstream.php:305
 #, fuzzy, php-format
@@ -4040,9 +3974,8 @@ msgid "You cannot silence users on this site."
 msgstr "无法向此用户发送消息。"
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "用户没有个人信息。"
+msgstr ""
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -4055,7 +3988,7 @@ msgstr ""
 #: actions/siteadminpanel.php:141
 #, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "不是有效的电子邮件"
+msgstr "不是有效的电子邮件。"
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4075,9 +4008,8 @@ msgid "General"
 msgstr ""
 
 #: actions/siteadminpanel.php:224
-#, fuzzy
 msgid "Site name"
-msgstr "新通告"
+msgstr ""
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -4149,7 +4081,7 @@ msgstr ""
 #: actions/sitenoticeadminpanel.php:56
 #, fuzzy
 msgid "Site Notice"
-msgstr "新通告"
+msgstr "通告"
 
 #: actions/sitenoticeadminpanel.php:67
 #, fuzzy
@@ -4168,7 +4100,7 @@ msgstr ""
 #: actions/sitenoticeadminpanel.php:176
 #, fuzzy
 msgid "Site notice text"
-msgstr "新通告"
+msgstr "删除通告"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
@@ -4177,13 +4109,13 @@ msgstr ""
 #: actions/sitenoticeadminpanel.php:198
 #, fuzzy
 msgid "Save site notice"
-msgstr "新通告"
+msgstr "删除通告"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
-msgstr "SMS短信设置"
+msgstr "头像设置"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4194,15 +4126,14 @@ msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "这个页面不提供您想要的媒体类型"
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 #, fuzzy
 msgid "SMS address"
-msgstr "IM 帐号"
+msgstr "电子邮件地址"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4235,7 +4166,7 @@ msgstr "确认"
 #: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
-msgstr "SMS短信电话号码"
+msgstr "没有电话号码。"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4246,7 +4177,7 @@ msgstr "电话号码，不带标点或空格，包含地区代码"
 #: actions/smssettings.php:195
 #, fuzzy
 msgid "SMS preferences"
-msgstr "首选项"
+msgstr "首选项已保存。"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4288,7 +4219,7 @@ msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求"
+"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
 "使用它。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
@@ -4300,7 +4231,7 @@ msgstr "确认码错误。"
 #: actions/smssettings.php:427
 #, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "已取消确认。"
+msgstr "SMS短信确认"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4310,9 +4241,8 @@ msgstr "这是他人的电话号码。"
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
-#, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "SMS短信电话号码"
+msgstr ""
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4350,7 +4280,7 @@ msgstr ""
 #: actions/snapshotadminpanel.php:65
 #, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "主站导航"
+msgstr "电子邮件地址确认"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
@@ -4404,13 +4334,13 @@ msgstr "头像设置"
 #: actions/subedit.php:70
 #, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "您未告知此个人信息"
+msgstr "您已订阅这些用户："
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
 #, fuzzy
 msgid "Could not save subscription."
-msgstr "无法删除订阅。"
+msgstr "无法添加新的订阅。"
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
@@ -4422,9 +4352,8 @@ msgid "No such profile."
 msgstr "没有这份通告。"
 
 #: actions/subscribe.php:117
-#, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "您未告知此个人信息"
+msgstr ""
 
 #: actions/subscribe.php:145
 #, fuzzy
@@ -4439,7 +4368,7 @@ msgstr "订阅者"
 #: actions/subscribers.php:52
 #, fuzzy, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%s 订阅者, 第 %d 页"
+msgstr "%1$s 和好友，第%2$d页"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4476,7 +4405,7 @@ msgstr "所有订阅"
 #: actions/subscriptions.php:54
 #, fuzzy, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "所有订阅"
+msgstr "%1$s 和好友，第%2$d页"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4514,27 +4443,26 @@ msgstr "SMS短信"
 #: actions/tag.php:69
 #, fuzzy, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "用户自加标签 %s - 第 %d 页"
+msgstr "带 %s 标签的通告"
 
 #: actions/tag.php:87
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合"
 
 #: actions/tag.php:93
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合"
 
 #: actions/tag.php:99
 #, fuzzy, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "%s 的通告聚合"
+msgstr "%s 好友的聚合"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "没有这份文档。"
+msgstr ""
 
 #: actions/tagother.php:65
 #, fuzzy, php-format
@@ -4571,7 +4499,7 @@ msgstr "你只能给你订阅的人或订阅你的人加标签。"
 #: actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
-msgstr "无法保存头像"
+msgstr "无法保存个人信息。"
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -4583,14 +4511,13 @@ msgid "No such tag."
 msgstr "未找到此消息。"
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "您已成功阻止该用户："
+msgstr ""
 
 #: actions/unsandbox.php:72
 #, fuzzy
 msgid "User is not sandboxed."
-msgstr "用户没有个人信息。"
+msgstr "用户没有通告。"
 
 #: actions/unsilence.php:72
 #, fuzzy
@@ -4600,7 +4527,7 @@ msgstr "用户没有个人信息。"
 #: actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile ID in request."
-msgstr "服务器没有返回个人信息URL。"
+msgstr "未收到认证请求！"
 
 #: actions/unsubscribe.php:98
 #, fuzzy
@@ -4693,19 +4620,15 @@ msgid "Authorize subscription"
 msgstr "确认订阅"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""
-"请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
-"告，请点击\"取消\"。"
 
 #: actions/userauthorization.php:196 actions/version.php:167
-#, fuzzy
 msgid "License"
-msgstr "注册证"
+msgstr ""
 
 #: actions/userauthorization.php:217
 msgid "Accept"
@@ -4724,7 +4647,7 @@ msgstr "拒绝"
 #: actions/userauthorization.php:220
 #, fuzzy
 msgid "Reject this subscription"
-msgstr "所有订阅"
+msgstr "确认订阅"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4735,25 +4658,22 @@ msgid "Subscription authorized"
 msgstr "订阅已确认"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "订阅被拒绝"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
-msgstr "订阅已被拒绝，但是没有回传URL。请到此网站查看如何拒绝订阅。"
+msgstr ""
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4781,14 +4701,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "无法访问头像URL '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "'%s' 图像格式错误"
+msgstr ""
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 #, fuzzy
@@ -4809,12 +4729,11 @@ msgstr ""
 #: actions/usergroups.php:66
 #, fuzzy, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "%s 组成员, 第 %d 页"
+msgstr "组，第 %d 页"
 
 #: actions/usergroups.php:132
-#, fuzzy
 msgid "Search for more groups"
-msgstr "检索人或文字"
+msgstr ""
 
 #: actions/usergroups.php:159
 #, fuzzy, php-format
@@ -4934,7 +4853,7 @@ msgstr "大小不正确。"
 #: classes/Group_member.php:42
 #, fuzzy
 msgid "Group join failed."
-msgstr "组资料"
+msgstr "小组未找到。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
@@ -4946,7 +4865,7 @@ msgstr "无法更新组"
 #: classes/Group_member.php:63
 #, fuzzy
 msgid "Group leave failed."
-msgstr "组资料"
+msgstr "上传失败"
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
@@ -4993,7 +4912,7 @@ msgstr ""
 #: classes/Notice.php:190
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "添加标签时数据库出错：%s"
+msgstr "添加头像出错"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:260
@@ -5045,7 +4964,7 @@ 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:1745
+#: classes/Notice.php:1746
 #, fuzzy, php-format
 msgid "RT @%1$s %2$s"
 msgstr "%1$s (%2$s)"
@@ -5084,8 +5003,9 @@ msgstr "那个用户阻止了你的订阅。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
+#, fuzzy
 msgid "Already subscribed!"
-msgstr ""
+msgstr "未订阅！"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
@@ -5103,19 +5023,19 @@ msgstr "未订阅！"
 #: classes/Subscription.php:178
 #, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "无法删除订阅。"
+msgstr "无法添加新的订阅。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 #, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "无法删除订阅。"
+msgstr "无法添加新的订阅。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
 #, fuzzy
 msgid "Could not delete subscription."
-msgstr "无法删除订阅。"
+msgstr "无法添加新的订阅。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5133,19 +5053,19 @@ msgstr "无法创建组。"
 #: classes/User_group.php:506
 #, fuzzy
 msgid "Could not set group URI."
-msgstr "无法删除订阅。"
+msgstr "无法创建组。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 #, fuzzy
 msgid "Could not set group membership."
-msgstr "无法删除订阅。"
+msgstr "无法创建组。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
 #, fuzzy
 msgid "Could not save local group info."
-msgstr "无法删除订阅。"
+msgstr "无法保存个人信息。"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5201,10 +5121,9 @@ msgstr "主站导航"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "个人资料及朋友年表"
+msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #: lib/action.php:445
@@ -5218,14 +5137,13 @@ msgstr "个人"
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "修改资料"
+msgstr "修改密码"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "无法重定向到服务器：%s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5265,21 +5183,20 @@ msgstr "邀请"
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "登出本站"
+msgstr "登录"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
 #, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "登出"
+msgstr "logo已更新。"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "创建新帐号"
+msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:485
@@ -5293,7 +5210,7 @@ msgstr "注册"
 #, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr "登入本站"
+msgstr "登录"
 
 #: lib/action.php:491
 #, fuzzy
@@ -5316,10 +5233,9 @@ msgstr "帮助"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "检索人或文字"
+msgstr ""
 
 #: lib/action.php:503
 #, fuzzy
@@ -5349,7 +5265,7 @@ msgstr "新通告"
 #: lib/action.php:762
 #, fuzzy
 msgid "Secondary site navigation"
-msgstr "次项站导航"
+msgstr "主站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5398,13 +5314,11 @@ msgstr "StatusNet软件注册证"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site."
-"broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5465,14 +5379,13 @@ msgstr "分页"
 #: lib/action.php:1203
 #, fuzzy
 msgid "After"
-msgstr "« 之后"
+msgstr "其他"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "之前 »"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5543,10 +5456,9 @@ msgstr "SMS短信确认"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "个人"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
@@ -5581,7 +5493,7 @@ msgstr "SMS短信确认"
 #: lib/adminpanelaction.php:398
 #, fuzzy
 msgid "Edit site notice"
-msgstr "新通告"
+msgstr "删除通告"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
@@ -5606,21 +5518,19 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr "您的主页、博客或在其他站点的URL"
+msgstr ""
 
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
@@ -5635,9 +5545,8 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "您的主页、博客或在其他站点的URL"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5700,7 +5609,7 @@ msgstr ""
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "移除"
+msgstr "恢复"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5716,7 +5625,7 @@ msgstr ""
 #: lib/attachmentlist.php:279
 #, fuzzy
 msgid "Provider"
-msgstr "个人信息"
+msgstr "预览"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
@@ -5732,9 +5641,8 @@ msgid "Password changing failed"
 msgstr "密码已保存。"
 
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "密码已保存。"
+msgstr ""
 
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
@@ -5749,9 +5657,8 @@ msgid "Command failed"
 msgstr "执行失败"
 
 #: lib/command.php:83 lib/command.php:105
-#, fuzzy
 msgid "Notice with that id does not exist"
-msgstr "没有找到此ID的信息。"
+msgstr ""
 
 #: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
@@ -5805,16 +5712,16 @@ msgstr "您已经是该组成员"
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: lib/command.php:339
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %1$s to group %2$s"
-msgstr "无法把 %s 用户添加到 %s 组"
+msgstr ""
 
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %1$s from group %2$s"
-msgstr "无法订阅用户：未找到。"
+msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:418
@@ -5852,9 +5759,9 @@ msgstr ""
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 #: lib/command.php:472
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+msgstr ""
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
@@ -5875,7 +5782,7 @@ msgstr "无法开启通告。"
 #: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
-msgstr "删除通告"
+msgstr "无法删除通告。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
@@ -5887,17 +5794,17 @@ msgstr "消息已发布。"
 #: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
-msgstr "保存通告时出错。"
+msgstr "保存用户设置时出错。"
 
 #: lib/command.php:562
-#, fuzzy, php-format
+#, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+msgstr ""
 
 #: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
-msgstr "无法删除通告。"
+msgstr "%s 的回复"
 
 #: lib/command.php:573
 #, fuzzy
@@ -5909,9 +5816,8 @@ msgid "Specify the name of the user to subscribe to"
 msgstr "指定要订阅的用户名"
 
 #: lib/command.php:628
-#, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
-msgstr "您未告知此个人信息"
+msgstr ""
 
 #: lib/command.php:634
 #, php-format
@@ -5964,7 +5870,7 @@ msgstr "取消订阅 %s"
 #: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
-msgstr "您未告知此个人信息"
+msgstr "您已订阅这些用户："
 
 #: lib/command.php:780
 msgid "You are subscribed to this person:"
@@ -6047,9 +5953,8 @@ msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #: lib/common.php:139
-#, fuzzy
 msgid "Go to the installer."
-msgstr "登入本站"
+msgstr ""
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
@@ -6079,13 +5984,13 @@ msgstr ""
 #: lib/designsettings.php:105
 #, fuzzy
 msgid "Upload file"
-msgstr "上传"
+msgstr "上传失败"
 
 #: lib/designsettings.php:109
 #, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
-msgstr "您可以在这里上传个人头像。"
+msgstr "你可以给你的组上载一个logo图。"
 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
@@ -6126,9 +6031,8 @@ msgid "Export data"
 msgstr "导出数据"
 
 #: lib/galleryaction.php:121
-#, fuzzy
 msgid "Filter tags"
-msgstr "%s 标签的聚合"
+msgstr ""
 
 #: lib/galleryaction.php:131
 msgid "All"
@@ -6163,14 +6067,13 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页、博客或在其他站点的URL"
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+msgstr ""
 
 #: lib/groupeditform.php:179
 #, fuzzy
@@ -6193,9 +6096,9 @@ msgid "Blocked"
 msgstr "阻止"
 
 #: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked users"
-msgstr "阻止用户"
+msgstr ""
 
 #: lib/groupnav.php:108
 #, php-format
@@ -6205,7 +6108,7 @@ msgstr "编辑 %s群选项"
 #: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
-msgstr "Logo图标"
+msgstr "登录"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6259,7 +6162,7 @@ msgstr "不是图片文件或文件已损坏。"
 #: lib/imagefile.php:122
 #, fuzzy
 msgid "Lost our file."
-msgstr "没有这份通告。"
+msgstr "文件数据丢失"
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6286,7 +6189,7 @@ msgstr ""
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
-msgstr "加入"
+msgstr "登录"
 
 #: lib/leaveform.php:114
 #, fuzzy
@@ -6296,12 +6199,11 @@ msgstr "保存"
 #: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
-msgstr "输入用户名和密码以登录。"
+msgstr "用户名或密码不正确。"
 
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "创建新帐号"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6341,7 +6243,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6354,19 +6256,12 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s 开始关注您的 %2$s 信息。\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"为您效力的 %4$s\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 #, fuzzy, php-format
 msgid "Bio: %s"
-msgstr ""
-"自传Bio: %s\n"
-"\n"
+msgstr "位置：%s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6465,7 +6360,7 @@ msgstr ""
 #: lib/mail.php:589
 #, fuzzy, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s 收藏了您的通告"
+msgstr "如果有人收藏我的通告，发邮件通知我。"
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6541,10 +6436,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " 从 "
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6608,7 +6502,7 @@ msgstr ""
 #: lib/mediafile.php:202 lib/mediafile.php:238
 #, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "无法获取收藏的通告。"
+msgstr "无法删除收藏。"
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6635,15 +6529,14 @@ msgid "Available characters"
 msgstr "6 个或更多字符"
 
 #: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "发送"
+msgstr ""
 
 #: lib/noticeform.php:160
 #, fuzzy
 msgid "Send a notice"
-msgstr "发送消息"
+msgstr "新通告"
 
 #: lib/noticeform.php:173
 #, php-format
@@ -6659,14 +6552,12 @@ msgid "Attach a file"
 msgstr ""
 
 #: lib/noticeform.php:212
-#, fuzzy
 msgid "Share my location"
-msgstr "无法保存个人信息。"
+msgstr ""
 
 #: lib/noticeform.php:215
-#, fuzzy
 msgid "Do not share my location"
-msgstr "无法保存个人信息。"
+msgstr ""
 
 #: lib/noticeform.php:216
 msgid ""
@@ -6676,9 +6567,8 @@ msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
-#, fuzzy
 msgid "N"
-msgstr "否"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
@@ -6704,27 +6594,26 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 #, fuzzy
 msgid "in context"
 msgstr "没有内容！"
 
-#: lib/noticelist.php:602
-#, fuzzy
+#: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr "创建"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 #, fuzzy
 msgid "Notice repeated"
 msgstr "消息已发布。"
@@ -6798,7 +6687,7 @@ msgstr "您发送的消息"
 #: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
-msgstr "%s's 的消息的标签"
+msgstr "这个组所发布的消息的标签"
 
 #: lib/plugin.php:115
 #, fuzzy
@@ -6853,9 +6742,8 @@ msgid "User groups"
 msgstr "用户组"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-#, fuzzy
 msgid "Recent tags"
-msgstr "最近的标签"
+msgstr ""
 
 #: lib/publicgroupnav.php:88
 msgid "Featured"
@@ -6867,9 +6755,8 @@ msgid "Popular"
 msgstr "用户"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "没有这份文档。"
+msgstr ""
 
 #: lib/repeatform.php:107
 #, fuzzy
@@ -6886,9 +6773,9 @@ msgid "Repeat this notice"
 msgstr "无法删除通告。"
 
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "该组成员列表。"
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6902,7 +6789,7 @@ msgstr "收件箱"
 #: lib/sandboxform.php:78
 #, fuzzy
 msgid "Sandbox this user"
-msgstr "取消阻止次用户"
+msgstr "呼叫这个用户"
 
 #: lib/searchaction.php:120
 #, fuzzy
@@ -6948,19 +6835,18 @@ msgid "More..."
 msgstr "更多..."
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "新通告"
+msgstr ""
 
 #: lib/silenceform.php:78
 #, fuzzy
 msgid "Silence this user"
-msgstr "阻止该用户"
+msgstr "呼叫这个用户"
 
 #: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
-msgstr "%s 订阅的人"
+msgstr "远程订阅"
 
 #: lib/subgroupnav.php:91
 #, fuzzy, php-format
@@ -6994,7 +6880,7 @@ msgstr ""
 #: lib/tagcloudsection.php:56
 #, fuzzy
 msgid "None"
-msgstr "否"
+msgstr "（没有）"
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -7038,12 +6924,11 @@ msgstr ""
 #: lib/themeuploader.php:234
 #, fuzzy
 msgid "Error opening theme archive."
-msgstr "更新远程的个人信息时出错"
+msgstr "发送消息出错。"
 
 #: lib/topposterssection.php:74
-#, fuzzy
 msgid "Top posters"
-msgstr "灌水精英"
+msgstr ""
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
@@ -7052,7 +6937,7 @@ msgstr ""
 #: lib/unsandboxform.php:80
 #, fuzzy
 msgid "Unsandbox this user"
-msgstr "取消阻止次用户"
+msgstr "呼叫这个用户"
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
@@ -7061,7 +6946,7 @@ msgstr ""
 #: lib/unsilenceform.php:78
 #, fuzzy
 msgid "Unsilence this user"
-msgstr "取消阻止次用户"
+msgstr "呼叫这个用户"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
@@ -7085,7 +6970,7 @@ msgstr "头像"
 #: lib/userprofile.php:234 lib/userprofile.php:248
 #, fuzzy
 msgid "User actions"
-msgstr "未知动作"
+msgstr "组动作"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
@@ -7117,13 +7002,12 @@ msgstr ""
 #: lib/userprofile.php:364
 #, fuzzy
 msgid "User role"
-msgstr "用户没有个人信息。"
+msgstr "用户组"
 
 #: lib/userprofile.php:366
-#, fuzzy
 msgctxt "role"
 msgid "Administrator"
-msgstr "admin管理员"
+msgstr ""
 
 #: lib/userprofile.php:367
 msgctxt "role"
@@ -7195,6 +7079,6 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 
 #: lib/xmppmanager.php:403
-#, fuzzy, php-format
+#, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+msgstr ""
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index be09ed6d7..3f29e3f5b 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:10+0000\n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:13:29+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -27,15 +27,13 @@ msgstr "接受"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #. TRANS: Form legend for registration form.
 #: actions/accessadminpanel.php:161
-#, fuzzy
 msgid "Registration"
-msgstr "所有訂閱"
+msgstr ""
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
@@ -65,15 +63,13 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "無此使用者"
+msgstr ""
 
 #. TRANS: Title / tooltip for button to save access settings in site admin panel
 #: actions/accessadminpanel.php:202
-#, fuzzy
 msgid "Save access settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
@@ -91,7 +87,7 @@ msgstr ""
 #: actions/showfavorites.php:138 actions/tag.php:52
 #, fuzzy
 msgid "No such page."
-msgstr "無此通知"
+msgstr "無此使用者"
 
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
@@ -135,21 +131,21 @@ msgstr "%s與好友"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:125
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (Atom)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
@@ -289,9 +285,8 @@ msgid "Could not update your design."
 msgstr "無法更新使用者"
 
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "無法更新使用者"
+msgstr ""
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
@@ -331,8 +326,9 @@ msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
 #: actions/apidirectmessagenew.php:138
+#, fuzzy
 msgid "Recipient user not found."
-msgstr ""
+msgstr "確認碼遺失"
 
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
@@ -348,21 +344,23 @@ msgid "This status is already a favorite."
 msgstr ""
 
 #: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#, fuzzy
 msgid "Could not create favorite."
-msgstr ""
+msgstr "無法儲存個人資料"
 
 #: actions/apifavoritedestroy.php:123
 msgid "That status is not a favorite."
 msgstr ""
 
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#, fuzzy
 msgid "Could not delete favorite."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: actions/apifriendshipscreate.php:109
 #, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "無法連結到伺服器:%s"
+msgstr "無法儲存個人資料"
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -370,14 +368,12 @@ msgid "Could not follow user: %s is already on your list."
 msgstr ""
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "無法更新使用者"
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
@@ -408,8 +404,9 @@ msgstr "此暱稱已有人使用。再試試看別的吧。"
 #: actions/apigroupcreate.php:183 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
+#, fuzzy
 msgid "Not a valid nickname."
-msgstr ""
+msgstr "無暱稱"
 
 #: actions/apigroupcreate.php:199 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
@@ -428,7 +425,7 @@ msgstr "全名過長（最多255字元）"
 #: actions/newapplication.php:172
 #, fuzzy, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "自我介紹過長(共140個字元)"
+msgstr "地點過長（共255個字）"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -445,7 +442,7 @@ msgstr ""
 #: actions/apigroupcreate.php:267
 #, fuzzy, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "個人首頁連結%s無效"
+msgstr "尺寸錯誤"
 
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
@@ -463,20 +460,21 @@ msgstr ""
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 #, fuzzy
 msgid "Group not found."
-msgstr "目前無請求"
+msgstr "確認碼遺失"
 
 #: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#, fuzzy
 msgid "You are already a member of that group."
-msgstr ""
+msgstr "無法連結到伺服器:%s"
 
 #: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
 #: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/apigroupleave.php:115
 #, fuzzy
@@ -484,21 +482,21 @@ msgid "You are not a member of this group."
 msgstr "無法連結到伺服器:%s"
 
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "無法從 %s 建立OpenID"
+msgstr ""
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -513,9 +511,8 @@ msgid "groups on %s"
 msgstr ""
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "無此通知"
+msgstr ""
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -550,14 +547,12 @@ msgid "Invalid nickname / password!"
 msgstr "使用者名稱或密碼無效"
 
 #: actions/apioauthauthorize.php:159
-#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr "使用者設定發生錯誤"
+msgstr ""
 
 #: actions/apioauthauthorize.php:185
-#, fuzzy
 msgid "Database error inserting OAuth application user."
-msgstr "增加回覆時,資料庫發生錯誤: %s"
+msgstr ""
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -616,8 +611,9 @@ msgstr "暱稱"
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:316 actions/login.php:255
 #: actions/register.php:436 lib/accountsettingsaction.php:125
+#, fuzzy
 msgid "Password"
-msgstr ""
+msgstr "新密碼"
 
 #: actions/apioauthauthorize.php:328
 msgid "Deny"
@@ -645,19 +641,16 @@ msgid "No such notice."
 msgstr "無此通知"
 
 #: actions/apistatusesretweet.php:83
-#, fuzzy
 msgid "Cannot repeat your own notice."
-msgstr "儲存使用者發生錯誤"
+msgstr ""
 
 #: actions/apistatusesretweet.php:91
-#, fuzzy
 msgid "Already repeated that notice."
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/apistatusesshow.php:139
-#, fuzzy
 msgid "Status deleted."
-msgstr "更新個人圖像"
+msgstr ""
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -674,9 +667,8 @@ msgid "That's too long. Max notice size is %d chars."
 msgstr ""
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-#, fuzzy
 msgid "Not found."
-msgstr "目前無請求"
+msgstr ""
 
 #: actions/apistatusesupdate.php:306 actions/newnotice.php:178
 #, php-format
@@ -693,9 +685,9 @@ msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s的狀態是%2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/apitimelinementions.php:118
 #, fuzzy, php-format
@@ -733,18 +725,19 @@ msgid "Notices tagged with %s"
 msgstr ""
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/apitrends.php:87
+#, fuzzy
 msgid "API method under construction."
-msgstr ""
+msgstr "確認碼遺失"
 
 #: actions/attachment.php:73
 #, fuzzy
 msgid "No such attachment."
-msgstr "無此文件"
+msgstr "無此通知"
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -780,9 +773,8 @@ msgstr ""
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
-#, fuzzy
 msgid "Avatar settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -795,7 +787,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr ""
 
@@ -835,7 +827,7 @@ msgstr "更新個人圖像"
 #: actions/block.php:69
 #, fuzzy
 msgid "You already blocked that user."
-msgstr "無此使用者"
+msgstr "此Jabber ID已有人使用"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 #, fuzzy
@@ -864,9 +856,8 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
 msgid "Do not block this user"
-msgstr "無此使用者"
+msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -882,9 +873,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
 msgid "Block this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/block.php:187
 msgid "Failed to save block information."
@@ -903,35 +893,33 @@ msgstr ""
 #: lib/command.php:368
 #, fuzzy
 msgid "No such group."
-msgstr "無此通知"
+msgstr "無此使用者"
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s與好友"
+msgstr ""
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #: actions/blockedfromgroup.php:288
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr ""
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
 msgid "Unblock this user"
-msgstr "無此使用者"
+msgstr ""
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
@@ -948,8 +936,9 @@ msgid "Confirmation code not found."
 msgstr "確認碼遺失"
 
 #: actions/confirmaddress.php:85
+#, fuzzy
 msgid "That confirmation code is not for you!"
-msgstr ""
+msgstr "確認碼遺失"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
@@ -959,8 +948,9 @@ msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
+#, fuzzy
 msgid "That address has already been confirmed."
-msgstr ""
+msgstr "此電子信箱已註冊過了"
 
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
@@ -986,7 +976,7 @@ msgstr "無法取消信箱確認"
 #: actions/confirmaddress.php:146
 #, fuzzy
 msgid "Confirm address"
-msgstr "確認信箱"
+msgstr "確認"
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -1000,13 +990,13 @@ msgstr "地點"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#, fuzzy
 msgid "Notices"
-msgstr ""
+msgstr "新訊息"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "無法更新使用者"
+msgstr ""
 
 #: actions/deleteapplication.php:71
 #, fuzzy
@@ -1026,9 +1016,8 @@ msgid "There was a problem with your session token."
 msgstr ""
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
 msgid "Delete application"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1039,15 +1028,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
-#, fuzzy
 msgid "Do not delete this application"
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
-#, fuzzy
 msgid "Delete this application"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1057,12 +1044,14 @@ msgstr "請在140個字以內描述你自己與你的興趣"
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: lib/adminpanelaction.php:73 lib/profileformaction.php:64
 #: lib/settingsaction.php:72
+#, fuzzy
 msgid "Not logged in."
-msgstr ""
+msgstr "已登入"
 
 #: actions/deletenotice.php:71
+#, fuzzy
 msgid "Can't delete this notice."
-msgstr ""
+msgstr "無法取消信箱確認"
 
 #: actions/deletenotice.php:103
 msgid ""
@@ -1071,8 +1060,9 @@ msgid ""
 msgstr ""
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
+#, fuzzy
 msgid "Delete notice"
-msgstr ""
+msgstr "新訊息"
 
 #: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
@@ -1080,12 +1070,11 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr ""
 
@@ -1095,9 +1084,8 @@ msgid "You cannot delete users."
 msgstr "無法更新使用者"
 
 #: actions/deleteuser.php:74
-#, fuzzy
 msgid "You can only delete local users."
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"
@@ -1111,9 +1099,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "無此使用者"
+msgstr ""
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -1132,19 +1119,18 @@ msgid "Invalid logo URL."
 msgstr "尺寸錯誤"
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #: actions/designadminpanel.php:426
 #, fuzzy
 msgid "Change logo"
-msgstr "更改密碼"
+msgstr "更改"
 
 #: actions/designadminpanel.php:431
-#, fuzzy
 msgid "Site logo"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/designadminpanel.php:443
 #, fuzzy
@@ -1152,18 +1138,16 @@ msgid "Change theme"
 msgstr "更改"
 
 #: actions/designadminpanel.php:460
-#, fuzzy
 msgid "Site theme"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1272,12 +1256,11 @@ msgstr ""
 #: actions/doc.php:158
 #, fuzzy, php-format
 msgid "No such document \"%s\""
-msgstr "無此文件"
+msgstr "無此通知"
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
@@ -1308,9 +1291,8 @@ msgid "Name already in use. Try another one."
 msgstr "此暱稱已有人使用。再試試看別的吧。"
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "所有訂閱"
+msgstr ""
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
@@ -1368,12 +1350,12 @@ msgstr ""
 #: actions/editgroup.php:205 actions/newgroup.php:145
 #, fuzzy, php-format
 msgid "description is too long (max %d chars)."
-msgstr "自我介紹過長(共140個字元)"
+msgstr "地點過長（共255個字）"
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "個人首頁連結%s無效"
+msgstr ""
 
 #: actions/editgroup.php:258
 #, fuzzy
@@ -1384,7 +1366,7 @@ msgstr "無法更新使用者"
 #: actions/editgroup.php:264 classes/User_group.php:514
 #, fuzzy
 msgid "Could not create aliases."
-msgstr "無法存取個人圖像資料"
+msgstr "無法更新使用者"
 
 #: actions/editgroup.php:280
 msgid "Options saved."
@@ -1394,7 +1376,7 @@ msgstr ""
 #: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
-msgstr "線上即時通設定"
+msgstr "使用者設定發生錯誤"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1412,8 +1394,9 @@ msgstr "確認信箱"
 
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
+#, fuzzy
 msgid "Current confirmed email address."
-msgstr ""
+msgstr "目前已確認的Jabber/Gtalk地址"
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
@@ -1428,10 +1411,13 @@ msgid "Remove"
 msgstr ""
 
 #: actions/emailsettings.php:122
+#, fuzzy
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
+"等待確認此信箱。看看你的Jabber/GTalk是否有訊息指示下一步動作。(你加入%s到你的"
+"好友清單了嗎？)"
 
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
@@ -1454,10 +1440,9 @@ msgstr ""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "新增"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1486,9 +1471,8 @@ msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "確認信箱"
+msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1522,8 +1506,9 @@ msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:219
+#, fuzzy
 msgid "Publish a MicroID for my email address."
-msgstr ""
+msgstr "請輸入暱稱或電子信箱"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
@@ -1532,13 +1517,15 @@ msgstr ""
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
+#, fuzzy
 msgid "No email address."
-msgstr ""
+msgstr "此信箱無效"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
+#, fuzzy
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "此JabberID錯誤"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
@@ -1548,13 +1535,15 @@ msgstr "此信箱無效"
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/emailsettings.php:370
+#, fuzzy
 msgid "That is already your email address."
-msgstr ""
+msgstr "此信箱無效"
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:374
+#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr ""
+msgstr "此Jabber ID已有人使用"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
@@ -1566,18 +1555,20 @@ msgstr "無法輸入確認碼"
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:398
+#, fuzzy
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
+msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要先經過你的認可。"
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 #: actions/emailsettings.php:419 actions/imsettings.php:383
 #: actions/smssettings.php:408
+#, fuzzy
 msgid "No pending confirmation to cancel."
-msgstr ""
+msgstr "無確認碼"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
@@ -1589,13 +1580,14 @@ msgstr "請輸入暱稱或電子信箱"
 #: actions/emailsettings.php:438
 #, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "確認取消"
+msgstr "無確認碼"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 #: actions/emailsettings.php:458
+#, fuzzy
 msgid "That is not your email address."
-msgstr ""
+msgstr "請輸入暱稱或電子信箱"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
@@ -1604,15 +1596,17 @@ msgid "The email address was removed."
 msgstr "此電子信箱已註冊過了"
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
+#, fuzzy
 msgid "No incoming email address."
-msgstr ""
+msgstr "此信箱無效"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 #: actions/emailsettings.php:504 actions/emailsettings.php:528
 #: actions/smssettings.php:578 actions/smssettings.php:602
+#, fuzzy
 msgid "Couldn't update user record."
-msgstr ""
+msgstr "無法更新使用者"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:508 actions/smssettings.php:581
@@ -1621,8 +1615,9 @@ msgstr ""
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #: actions/emailsettings.php:532 actions/smssettings.php:605
+#, fuzzy
 msgid "New incoming email address added."
-msgstr ""
+msgstr "此信箱無效"
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1639,9 +1634,9 @@ msgid "Popular notices"
 msgstr "無此通知"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
@@ -1671,9 +1666,9 @@ msgid "%s's favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1693,22 +1688,20 @@ msgstr ""
 #: actions/file.php:34
 #, fuzzy
 msgid "No notice ID."
-msgstr "新訊息"
+msgstr "無此通知"
 
 #: actions/file.php:38
 #, fuzzy
 msgid "No notice."
-msgstr "新訊息"
+msgstr "無此通知"
 
 #: actions/file.php:42
-#, fuzzy
 msgid "No attachments."
-msgstr "無此文件"
+msgstr ""
 
 #: actions/file.php:51
-#, fuzzy
 msgid "No uploaded attachments."
-msgstr "無此文件"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1719,8 +1712,9 @@ msgid "User being listened to does not exist."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#, fuzzy
 msgid "You can use the local subscription!"
-msgstr ""
+msgstr "無法新增訂閱"
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
@@ -1731,9 +1725,8 @@ msgid "You are not authorized."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "無法轉換請求標記以致無法存取標記"
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
@@ -1752,7 +1745,7 @@ msgstr "無此通知"
 #: actions/getfile.php:83
 #, fuzzy
 msgid "Cannot read file."
-msgstr "無此通知"
+msgstr "無法儲存個人資料"
 
 #: actions/grantrole.php:62 actions/revokerole.php:62
 #, fuzzy
@@ -1764,9 +1757,8 @@ msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/grantrole.php:82
 msgid "User already has this role."
@@ -1798,13 +1790,13 @@ msgid "User is already blocked from group."
 msgstr ""
 
 #: actions/groupblock.php:100
+#, fuzzy
 msgid "User is not a member of group."
-msgstr ""
+msgstr "無法連結到伺服器:%s"
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1816,15 +1808,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
@@ -1928,9 +1918,9 @@ msgstr ""
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1953,9 +1943,8 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "新增帳號"
+msgstr ""
 
 #: actions/groupsearch.php:52
 #, php-format
@@ -1970,9 +1959,8 @@ msgstr ""
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "無結果"
+msgstr ""
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2005,7 +1993,7 @@ msgstr "儲存使用者發生錯誤"
 #: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
-msgstr "線上即時通設定"
+msgstr "使用者設定發生錯誤"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2019,16 +2007,14 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "線上即時通信箱"
+msgstr ""
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2076,8 +2062,9 @@ msgstr ""
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:179
+#, fuzzy
 msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
+msgstr "目前已確認的Jabber/Gtalk地址"
 
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
@@ -2101,8 +2088,9 @@ msgstr "此JabberID無效"
 
 #. TRANS: Message given saving IM address that is already set.
 #: actions/imsettings.php:326
+#, fuzzy
 msgid "That is already your Jabber ID."
-msgstr ""
+msgstr "此JabberID無效"
 
 #. TRANS: Message given saving IM address that is already set for another user.
 #: actions/imsettings.php:330
@@ -2133,13 +2121,14 @@ msgstr "無法取消信箱確認"
 #: actions/imsettings.php:402
 #, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "確認取消"
+msgstr "無確認碼"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:424
+#, fuzzy
 msgid "That is not your Jabber ID."
-msgstr ""
+msgstr "查無此Jabber ID"
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
@@ -2165,14 +2154,14 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "無法更新使用者"
+msgstr ""
 
 #: actions/invite.php:72
-#, php-format
+#, fuzzy, php-format
 msgid "Invalid email address: %s"
-msgstr ""
+msgstr "此信箱無效"
 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
@@ -2183,8 +2172,9 @@ msgid "Invite new users"
 msgstr ""
 
 #: actions/invite.php:128
+#, fuzzy
 msgid "You are already subscribed to these users:"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
@@ -2214,8 +2204,9 @@ msgid ""
 msgstr ""
 
 #: actions/invite.php:187
+#, fuzzy
 msgid "Email addresses"
-msgstr ""
+msgstr "此電子信箱已註冊過了"
 
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
@@ -2237,9 +2228,9 @@ msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
-#, php-format
+#, fuzzy, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
+msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
@@ -2294,8 +2285,9 @@ msgid "You must be logged in to leave a group."
 msgstr ""
 
 #: actions/leavegroup.php:100 lib/command.php:373
+#, fuzzy
 msgid "You are not a member of that group."
-msgstr ""
+msgstr "無法連結到伺服器:%s"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
@@ -2325,8 +2317,9 @@ msgid "Login to site"
 msgstr ""
 
 #: actions/login.php:258 actions/register.php:485
+#, fuzzy
 msgid "Remember me"
-msgstr ""
+msgstr "何時加入會員的呢？"
 
 #: actions/login.php:259 actions/register.php:487
 msgid "Automatically login in the future; not for shared computers!"
@@ -2345,7 +2338,7 @@ msgstr "為安全起見，請先重新輸入你的使用者名稱與密碼再更
 #: actions/login.php:292
 #, fuzzy
 msgid "Login with your username and password."
-msgstr "使用者名稱或密碼無效"
+msgstr "使用者名稱或密碼錯誤"
 
 #: actions/login.php:295
 #, php-format
@@ -2363,24 +2356,22 @@ msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "無法從 %s 建立OpenID"
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "無法從 %s 建立OpenID"
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "無結果"
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
@@ -2397,7 +2388,7 @@ msgstr ""
 #: actions/newapplication.php:258 actions/newapplication.php:267
 #, fuzzy
 msgid "Could not create application."
-msgstr "無法存取個人圖像資料"
+msgstr "無法取消信箱確認"
 
 #: actions/newgroup.php:53
 msgid "New group"
@@ -2412,8 +2403,9 @@ msgid "New message"
 msgstr ""
 
 #: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#, fuzzy
 msgid "You can't send a message to this user."
-msgstr ""
+msgstr "無法連結到伺服器:%s"
 
 #: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
 #: lib/command.php:555
@@ -2462,9 +2454,9 @@ msgid "Text search"
 msgstr ""
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "搜尋 \"%s\"相關資料"
+msgstr ""
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2481,14 +2473,14 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "所有符合 \"%s\"的更新"
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
@@ -2529,9 +2521,8 @@ msgid "You have allowed the following applications to access you account."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
-#, fuzzy
 msgid "You are not a user of that application."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
@@ -2547,9 +2538,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "無此通知"
+msgstr ""
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2558,9 +2548,9 @@ msgstr "%1$s的狀態是%2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "連結"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2585,7 +2575,7 @@ msgstr ""
 #: actions/othersettings.php:60
 #, fuzzy
 msgid "Other settings"
-msgstr "線上即時通設定"
+msgstr "使用者設定發生錯誤"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2617,14 +2607,12 @@ msgid "URL shortening service is too long (max 50 chars)."
 msgstr "地點過長（共255個字）"
 
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "新訊息"
+msgstr ""
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "新訊息"
+msgstr ""
 
 #: actions/otp.php:90
 #, fuzzy
@@ -2632,9 +2620,8 @@ msgid "No login token requested."
 msgstr "無確認請求"
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "新訊息"
+msgstr ""
 
 #: actions/otp.php:104
 msgid "Login token expired."
@@ -2668,8 +2655,9 @@ msgid "Password change"
 msgstr ""
 
 #: actions/passwordsettings.php:104
+#, fuzzy
 msgid "Old password"
-msgstr ""
+msgstr "新密碼"
 
 #: actions/passwordsettings.php:108 actions/recoverpassword.php:235
 msgid "New password"
@@ -2693,8 +2681,9 @@ msgid "Change"
 msgstr "更改"
 
 #: actions/passwordsettings.php:154 actions/register.php:237
+#, fuzzy
 msgid "Password must be 6 or more characters."
-msgstr ""
+msgstr "6個以上字元"
 
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
@@ -2726,24 +2715,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2766,9 +2755,8 @@ msgid "Path"
 msgstr ""
 
 #: actions/pathsadminpanel.php:242
-#, fuzzy
 msgid "Site path"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
@@ -2810,7 +2798,7 @@ msgstr "個人圖像"
 #: actions/pathsadminpanel.php:284
 #, fuzzy
 msgid "Avatar server"
-msgstr "線上即時通設定"
+msgstr "個人圖像"
 
 #: actions/pathsadminpanel.php:288
 #, fuzzy
@@ -2818,9 +2806,8 @@ msgid "Avatar path"
 msgstr "更新個人圖像"
 
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "更新個人圖像"
+msgstr ""
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
@@ -2863,18 +2850,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "線上即時通設定"
+msgstr ""
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2893,9 +2878,9 @@ msgid "Not a valid people tag: %s."
 msgstr "此信箱無效"
 
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/postnotice.php:95
 #, fuzzy
@@ -2908,8 +2893,9 @@ msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’.
 msgstr ""
 
 #: actions/profilesettings.php:60
+#, fuzzy
 msgid "Profile settings"
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #: actions/profilesettings.php:71
 msgid ""
@@ -2941,14 +2927,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3004,24 +2989,26 @@ msgstr ""
 #: actions/profilesettings.php:228 actions/register.php:230
 #, fuzzy, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "自我介紹過長(共140個字元)"
+msgstr "地點過長（共255個字）"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #: actions/profilesettings.php:241
+#, fuzzy
 msgid "Language is too long (max 50 chars)."
-msgstr ""
+msgstr "地點過長（共255個字）"
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "個人首頁連結%s無效"
+msgstr "尺寸錯誤"
 
 #: actions/profilesettings.php:306
+#, fuzzy
 msgid "Couldn't update user for autosubscribe."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: actions/profilesettings.php:363
 #, fuzzy
@@ -3048,8 +3035,9 @@ msgid "Beyond the page limit (%s)."
 msgstr ""
 
 #: actions/public.php:92
+#, fuzzy
 msgid "Could not retrieve public stream."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: actions/public.php:130
 #, php-format
@@ -3069,9 +3057,8 @@ msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "%s的公開內容"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3137,8 +3124,9 @@ msgid "Tag cloud"
 msgstr ""
 
 #: actions/recoverpassword.php:36
+#, fuzzy
 msgid "You are already logged in!"
-msgstr ""
+msgstr "已登入"
 
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
@@ -3161,14 +3149,16 @@ msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
 #: actions/recoverpassword.php:111
+#, fuzzy
 msgid "Could not update user with confirmed email address."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: actions/recoverpassword.php:152
+#, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
-msgstr ""
+msgstr "我們已寄出一封信到你帳號中的信箱，告訴你如何取回你的密碼。"
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
@@ -3179,8 +3169,9 @@ msgid "Password recovery"
 msgstr ""
 
 #: actions/recoverpassword.php:191
+#, fuzzy
 msgid "Nickname or email address"
-msgstr ""
+msgstr "請輸入暱稱或電子信箱"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -3191,12 +3182,14 @@ msgid "Recover"
 msgstr ""
 
 #: actions/recoverpassword.php:208
+#, fuzzy
 msgid "Reset password"
-msgstr ""
+msgstr "新密碼"
 
 #: actions/recoverpassword.php:209
+#, fuzzy
 msgid "Recover password"
-msgstr ""
+msgstr "新密碼"
 
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
@@ -3219,8 +3212,9 @@ msgid "Enter a nickname or email address."
 msgstr "請輸入暱稱或電子信箱"
 
 #: actions/recoverpassword.php:282
+#, fuzzy
 msgid "No user with that email address or username."
-msgstr ""
+msgstr "查無此使用者所註冊的信箱"
 
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
@@ -3296,12 +3290,14 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:432
+#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
+msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
 #: actions/register.php:437
+#, fuzzy
 msgid "6 or more characters. Required."
-msgstr ""
+msgstr "6個以上字元"
 
 #: actions/register.php:441
 msgid "Same as password above. Required."
@@ -3344,11 +3340,11 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr "不包含這些個人資料：密碼、電子信箱、線上即時通信箱、電話號碼"
+msgstr ""
 
 #: actions/register.php:583
 #, php-format
@@ -3384,16 +3380,18 @@ msgid ""
 msgstr ""
 
 #: actions/remotesubscribe.php:112
+#, fuzzy
 msgid "Remote subscribe"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
 msgstr ""
 
 #: actions/remotesubscribe.php:129
+#, fuzzy
 msgid "User nickname"
-msgstr ""
+msgstr "無暱稱"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
@@ -3409,8 +3407,9 @@ msgstr ""
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406
+#, fuzzy
 msgid "Subscribe"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
@@ -3425,37 +3424,32 @@ msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "無法取得轉換標記"
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
 #: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
 msgid "No notice specified."
-msgstr "新訊息"
+msgstr ""
 
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
 msgstr ""
 
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
-msgstr "無此使用者"
+msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "新增"
+msgstr ""
 
 #: actions/repeat.php:119
-#, fuzzy
 msgid "Repeated!"
-msgstr "新增"
+msgstr ""
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3464,24 +3458,24 @@ msgid "Replies to %s"
 msgstr ""
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/replies.php:199
 #, php-format
@@ -3505,28 +3499,25 @@ msgid ""
 msgstr ""
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "更新個人圖像"
+msgstr ""
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
@@ -3560,9 +3551,8 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
@@ -3586,9 +3576,8 @@ msgstr "暱稱"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "地點"
+msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
@@ -3650,28 +3639,29 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s與好友"
+msgstr ""
 
 #: actions/showfavorites.php:132
+#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "無法儲存個人資料"
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/showfavorites.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3704,14 +3694,13 @@ msgid "%s group"
 msgstr ""
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "所有訂閱"
+msgstr ""
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
@@ -3747,9 +3736,9 @@ msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 #, fuzzy
@@ -3767,9 +3756,8 @@ msgid "All members"
 msgstr ""
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "新增"
+msgstr ""
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3795,8 +3783,9 @@ msgid "Admins"
 msgstr ""
 
 #: actions/showmessage.php:81
+#, fuzzy
 msgid "No such message."
-msgstr ""
+msgstr "無此使用者"
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
@@ -3813,9 +3802,8 @@ msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "更新個人圖像"
+msgstr ""
 
 #: actions/showstream.php:73
 #, php-format
@@ -3823,14 +3811,14 @@ msgid " tagged %s"
 msgstr ""
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s與好友"
+msgstr ""
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/showstream.php:129
 #, php-format
@@ -3931,9 +3919,8 @@ msgid "General"
 msgstr ""
 
 #: actions/siteadminpanel.php:224
-#, fuzzy
 msgid "Site name"
-msgstr "新訊息"
+msgstr ""
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
@@ -4011,9 +3998,8 @@ msgid "Edit site-wide message"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:103
-#, fuzzy
 msgid "Unable to save site notice."
-msgstr "新訊息"
+msgstr ""
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
@@ -4035,9 +4021,8 @@ msgstr "新訊息"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4048,15 +4033,13 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "個人首頁位址錯誤"
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "線上即時通信箱"
+msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4070,8 +4053,9 @@ msgstr ""
 
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:142
+#, fuzzy
 msgid "Confirmation code"
-msgstr ""
+msgstr "無確認碼"
 
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
@@ -4092,8 +4076,9 @@ msgstr ""
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
+#, fuzzy
 msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
+msgstr "1-64個小寫英文字母或數字，勿加標點符號或空格"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
@@ -4114,8 +4099,9 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
+#, fuzzy
 msgid "No phone number."
-msgstr ""
+msgstr "無此使用者"
 
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
@@ -4129,8 +4115,9 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:356
+#, fuzzy
 msgid "That phone number already belongs to another user."
-msgstr ""
+msgstr "此Jabber ID已有人使用"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
@@ -4142,14 +4129,15 @@ msgstr "確認信已寄到你的線上即時通信箱。%s送給你得訊息要
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
+#, fuzzy
 msgid "That is the wrong confirmation number."
-msgstr ""
+msgstr "無法輸入確認碼"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 #, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "確認取消"
+msgstr "無確認碼"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4183,8 +4171,9 @@ msgstr ""
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 #: actions/smssettings.php:548
+#, fuzzy
 msgid "No code entered"
-msgstr ""
+msgstr "無內容"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
@@ -4242,19 +4231,19 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
-msgstr "線上即時通設定"
+msgstr ""
 
 #: actions/subedit.php:70
+#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "此帳號已註冊"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
 #, fuzzy
 msgid "Could not save subscription."
-msgstr "註冊失敗"
+msgstr "無法新增訂閱"
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
@@ -4280,13 +4269,14 @@ msgid "%s subscribers"
 msgstr "此帳號已註冊"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "所有訂閱"
+msgstr ""
 
 #: actions/subscribers.php:63
+#, fuzzy
 msgid "These are the people who listen to your notices."
-msgstr ""
+msgstr "現在%1$s在%2$s成為你的粉絲囉"
 
 #: actions/subscribers.php:67
 #, php-format
@@ -4355,9 +4345,9 @@ msgid "SMS"
 msgstr ""
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: actions/tag.php:87
 #, php-format
@@ -4365,9 +4355,9 @@ msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "發送給%s好友的訂閱"
+msgstr ""
 
 #: actions/tag.php:99
 #, php-format
@@ -4375,9 +4365,8 @@ msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "無此文件"
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
@@ -4385,9 +4374,8 @@ msgid "Tag %s"
 msgstr ""
 
 #: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
 msgid "User profile"
-msgstr "無此通知"
+msgstr ""
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
@@ -4412,7 +4400,7 @@ msgstr ""
 #: actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
-msgstr "無法存取個人圖像資料"
+msgstr "無法儲存個人資料"
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
@@ -4424,9 +4412,8 @@ msgid "No such tag."
 msgstr "無此通知"
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "無此使用者"
+msgstr ""
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
@@ -4511,9 +4498,8 @@ msgid "Automatically subscribe new users to this user."
 msgstr ""
 
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "地點"
+msgstr ""
 
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
@@ -4544,8 +4530,9 @@ msgstr "接受"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
+#, fuzzy
 msgid "Subscribe to this user"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
@@ -4554,7 +4541,7 @@ msgstr ""
 #: actions/userauthorization.php:220
 #, fuzzy
 msgid "Reject this subscription"
-msgstr "所有訂閱"
+msgstr "註冊確認"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4608,9 +4595,9 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "無法讀取此%sURL的圖像"
+msgstr ""
 
 #: actions/userauthorization.php:355
 #, php-format
@@ -4633,18 +4620,18 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "所有訂閱"
+msgstr ""
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
 #: actions/usergroups.php:159
-#, php-format
+#, fuzzy, php-format
 msgid "%s is not a member of any group."
-msgstr ""
+msgstr "無法連結到伺服器:%s"
 
 #: actions/usergroups.php:164
 #, php-format
@@ -4707,9 +4694,8 @@ msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:789
-#, fuzzy
 msgid "Version"
-msgstr "地點"
+msgstr ""
 
 #: actions/version.php:199
 msgid "Author(s)"
@@ -4757,21 +4743,18 @@ msgstr "尺寸錯誤"
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
-#, fuzzy
 msgid "Group join failed."
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
-#, fuzzy
 msgid "Not part of group."
-msgstr "無法更新使用者"
+msgstr ""
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
-#, fuzzy
 msgid "Group leave failed."
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
@@ -4782,9 +4765,9 @@ msgstr "無法更新使用者"
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "無法存取個人圖像資料"
+msgstr ""
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -4798,13 +4781,15 @@ msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
+#, fuzzy
 msgid "Could not insert message."
-msgstr ""
+msgstr "無法新增訂閱"
 
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:74
+#, fuzzy
 msgid "Could not update message with new URI."
-msgstr ""
+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).
@@ -4817,7 +4802,7 @@ msgstr ""
 #: classes/Notice.php:190
 #, fuzzy, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "增加回覆時,資料庫發生錯誤: %s"
+msgstr "個人圖像插入錯誤"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
 #: classes/Notice.php:260
@@ -4852,8 +4837,9 @@ msgstr ""
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 #: classes/Notice.php:353 classes/Notice.php:380
+#, fuzzy
 msgid "Problem saving notice."
-msgstr ""
+msgstr "儲存使用者發生錯誤"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 #: classes/Notice.php:892
@@ -4862,13 +4848,12 @@ msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 #: classes/Notice.php:991
-#, fuzzy
 msgid "Problem saving group inbox."
-msgstr "儲存使用者發生錯誤"
+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:1745
+#: classes/Notice.php:1746
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4891,13 +4876,12 @@ msgstr ""
 #: classes/Remote_profile.php:54
 #, fuzzy
 msgid "Missing profile."
-msgstr "無此通知"
+msgstr "新的更人資料輸入錯誤"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "新訊息"
+msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -4906,8 +4890,9 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
+#, fuzzy
 msgid "Already subscribed!"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
@@ -4924,19 +4909,19 @@ msgstr "此帳號已註冊"
 #: classes/Subscription.php:178
 #, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "無法刪除帳號"
+msgstr "無法新增訂閱"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
 #, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "無法刪除帳號"
+msgstr "無法新增訂閱"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
 #, fuzzy
 msgid "Could not delete subscription."
-msgstr "無法刪除帳號"
+msgstr "無法新增訂閱"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -4949,25 +4934,25 @@ msgstr ""
 #: classes/User_group.php:496
 #, fuzzy
 msgid "Could not create group."
-msgstr "無法存取個人圖像資料"
+msgstr "無法更新使用者"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
 #, fuzzy
 msgid "Could not set group URI."
-msgstr "註冊失敗"
+msgstr "無法儲存個人資料"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 #, fuzzy
 msgid "Could not set group membership."
-msgstr "註冊失敗"
+msgstr "無法更新使用者"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
 #, fuzzy
 msgid "Could not save local group info."
-msgstr "註冊失敗"
+msgstr "無法儲存個人資料"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -4982,8 +4967,9 @@ msgstr "無法上傳個人圖像"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
+#, fuzzy
 msgid "Change your password"
-msgstr ""
+msgstr "更改密碼"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
@@ -4992,9 +4978,8 @@ msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
-#, fuzzy
 msgid "Design your profile"
-msgstr "無此通知"
+msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
@@ -5030,24 +5015,21 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #: lib/action.php:445
-#, fuzzy
 msgctxt "MENU"
 msgid "Personal"
-msgstr "地點"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "更改密碼"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "無法連結到伺服器:%s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5056,10 +5038,9 @@ msgstr "連結"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "確認信箱"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
@@ -5076,10 +5057,9 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
-msgstr "尺寸錯誤"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
@@ -5089,24 +5069,21 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "登出"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "新增帳號"
+msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:485
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
-msgstr "所有訂閱"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5213,13 +5190,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%**是由[%%site.broughtby%%](%%site.broughtbyurl%%)所提供的微型"
-"部落格服務"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5238,9 +5213,8 @@ msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
 #: lib/action.php:850
-#, fuzzy
 msgid "Site content license"
-msgstr "新訊息"
+msgstr ""
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
@@ -5281,9 +5255,8 @@ msgstr ""
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "之前的內容»"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5336,10 +5309,9 @@ msgstr "確認信箱"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "新訊息"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
@@ -5349,16 +5321,15 @@ msgstr "確認信箱"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "地點"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
 #, fuzzy
 msgid "User configuration"
-msgstr "確認信箱"
+msgstr "無確認碼"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5412,15 +5383,14 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
@@ -5552,9 +5522,8 @@ msgid "Notice with that id does not exist"
 msgstr ""
 
 #: lib/command.php:99 lib/command.php:596
-#, fuzzy
 msgid "User has no last notice"
-msgstr "新訊息"
+msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
@@ -5607,14 +5576,14 @@ msgstr "無法連結到伺服器:%s"
 #: lib/command.php:339
 #, fuzzy, php-format
 msgid "Could not join user %1$s to group %2$s"
-msgstr "無法連結到伺服器:%s"
+msgstr "無法更新使用者"
 
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: lib/command.php:385
-#, fuzzy, php-format
+#, php-format
 msgid "Could not remove user %1$s from group %2$s"
-msgstr "無法從 %s 建立OpenID"
+msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #: lib/command.php:418
@@ -5625,22 +5594,22 @@ msgstr "全名"
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/command.php:422 lib/mail.php:268
-#, php-format
+#, fuzzy, php-format
 msgid "Location: %s"
-msgstr ""
+msgstr "地點"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/command.php:426 lib/mail.php:271
-#, php-format
+#, fuzzy, php-format
 msgid "Homepage: %s"
-msgstr ""
+msgstr "個人首頁"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #: lib/command.php:430
-#, php-format
+#, fuzzy, php-format
 msgid "About: %s"
-msgstr ""
+msgstr "關於"
 
 #: lib/command.php:457
 #, php-format
@@ -5664,25 +5633,24 @@ msgid "Direct message to %s sent"
 msgstr ""
 
 #: lib/command.php:494
+#, fuzzy
 msgid "Error sending direct message."
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #: lib/command.php:514
-#, fuzzy
 msgid "Cannot repeat your own notice"
-msgstr "儲存使用者發生錯誤"
+msgstr ""
 
 #: lib/command.php:519
-#, fuzzy
 msgid "Already repeated that notice"
-msgstr "無此使用者"
+msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 #: lib/command.php:529
-#, fuzzy, php-format
+#, php-format
 msgid "Notice from %s repeated"
-msgstr "更新個人圖像"
+msgstr ""
 
 #: lib/command.php:531
 #, fuzzy
@@ -5695,9 +5663,9 @@ msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
 #: lib/command.php:571
-#, fuzzy, php-format
+#, php-format
 msgid "Reply to %s sent"
-msgstr "&s的微型部落格"
+msgstr ""
 
 #: lib/command.php:573
 msgid "Error saving notice."
@@ -5730,16 +5698,18 @@ msgid "Command not yet implemented."
 msgstr ""
 
 #: lib/command.php:685
+#, fuzzy
 msgid "Notification off."
-msgstr ""
+msgstr "無確認碼"
 
 #: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
 #: lib/command.php:708
+#, fuzzy
 msgid "Notification on."
-msgstr ""
+msgstr "無確認碼"
 
 #: lib/command.php:710
 msgid "Can't turn on notification."
@@ -5874,9 +5844,8 @@ msgid "Database error"
 msgstr ""
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "無此通知"
+msgstr ""
 
 #: lib/designsettings.php:109
 msgid ""
@@ -5954,14 +5923,13 @@ msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "請在140個字以內描述你自己與你的興趣"
+msgstr ""
 
 #: lib/groupeditform.php:179
 msgid ""
@@ -5978,14 +5946,13 @@ msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked users"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/groupnav.php:108
 #, php-format
@@ -5995,7 +5962,7 @@ msgstr ""
 #: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
-msgstr "登出"
+msgstr "登入"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6035,8 +6002,9 @@ msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
 #: lib/imagefile.php:93
+#, fuzzy
 msgid "Partial upload."
-msgstr ""
+msgstr "更新個人圖像"
 
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
@@ -6047,9 +6015,8 @@ msgid "Not an image or corrupt file."
 msgstr ""
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
-msgstr "無此通知"
+msgstr ""
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6088,9 +6055,8 @@ msgid "Login with a username and password"
 msgstr "使用者名稱或密碼無效"
 
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "新增帳號"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6130,7 +6096,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6143,13 +6109,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"現在%1$s在%2$s成為你的粉絲囉。\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"\n"
-"%4$s.\n"
-"敬上。\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
@@ -6159,9 +6118,9 @@ msgstr "自我介紹"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
-#, php-format
+#, fuzzy, php-format
 msgid "New email address for posting to %s"
-msgstr ""
+msgstr "查無此使用者所註冊的信箱"
 
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
@@ -6179,14 +6138,15 @@ msgstr ""
 
 #. TRANS: Subject line for SMS-by-email notification messages
 #: lib/mail.php:433
-#, php-format
+#, fuzzy, php-format
 msgid "%s status"
-msgstr ""
+msgstr "%1$s的狀態是%2$s"
 
 #. TRANS: Subject line for SMS-by-email address confirmation message
 #: lib/mail.php:460
+#, fuzzy
 msgid "SMS confirmation"
-msgstr ""
+msgstr "無確認碼"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
@@ -6245,9 +6205,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "現在%1$s在%2$s成為你的粉絲囉"
+msgstr ""
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6323,17 +6283,19 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr ""
 
 #: lib/mailhandler.php:37
+#, fuzzy
 msgid "Could not parse message."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: lib/mailhandler.php:42
+#, fuzzy
 msgid "Not a registered user."
-msgstr ""
+msgstr "此恢復碼錯誤"
 
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
@@ -6387,9 +6349,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "無法更新使用者"
+msgstr ""
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6438,14 +6399,12 @@ msgid "Attach a file"
 msgstr ""
 
 #: lib/noticeform.php:212
-#, fuzzy
 msgid "Share my location"
-msgstr "無法儲存個人資料"
+msgstr ""
 
 #: lib/noticeform.php:215
-#, fuzzy
 msgid "Do not share my location"
-msgstr "無法儲存個人資料"
+msgstr ""
 
 #: lib/noticeform.php:216
 msgid ""
@@ -6482,28 +6441,26 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 #, fuzzy
 msgid "in context"
 msgstr "無內容"
 
-#: lib/noticelist.php:602
-#, fuzzy
+#: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr "新增"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:674
-#, fuzzy
+#: lib/noticelist.php:675
 msgid "Notice repeated"
-msgstr "更新個人圖像"
+msgstr ""
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -6580,16 +6537,18 @@ msgid "Unknown"
 msgstr ""
 
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#, fuzzy
 msgid "Subscriptions"
-msgstr ""
+msgstr "所有訂閱"
 
 #: lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "所有訂閱"
 
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#, fuzzy
 msgid "Subscribers"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: lib/profileaction.php:161
 #, fuzzy
@@ -6638,28 +6597,25 @@ msgid "Popular"
 msgstr ""
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "無此文件"
+msgstr ""
 
 #: lib/repeatform.php:107
-#, fuzzy
 msgid "Repeat this notice?"
-msgstr "無此通知"
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr ""
 
 #: lib/repeatform.php:132
-#, fuzzy
 msgid "Repeat this notice"
-msgstr "無此通知"
+msgstr ""
 
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6670,9 +6626,8 @@ msgid "Sandbox"
 msgstr ""
 
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -6715,14 +6670,12 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "新訊息"
+msgstr ""
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/subgroupnav.php:83
 #, fuzzy, php-format
@@ -6815,26 +6768,26 @@ msgid "Unsandbox"
 msgstr ""
 
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "無此使用者"
+msgstr ""
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: lib/unsubscribeform.php:137
+#, fuzzy
 msgid "Unsubscribe"
-msgstr ""
+msgstr "此帳號已註冊"
 
 #: lib/usernoprofileexception.php:58
 #, php-format
@@ -6857,7 +6810,7 @@ msgstr ""
 #: lib/userprofile.php:263
 #, fuzzy
 msgid "Edit profile settings"
-msgstr "線上即時通設定"
+msgstr "使用者設定發生錯誤"
 
 #: lib/userprofile.php:264
 msgid "Edit"
@@ -6876,9 +6829,8 @@ msgid "Moderate"
 msgstr ""
 
 #: lib/userprofile.php:364
-#, fuzzy
 msgid "User role"
-msgstr "無此通知"
+msgstr ""
 
 #: lib/userprofile.php:366
 msgctxt "role"
-- 
cgit v1.2.3


From db46d73a5f3cac322c4ca2ef4e4c863a0346bb7e Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Wed, 11 Aug 2010 12:46:54 +0200
Subject: Add dummy support for Esperanto.

---
 lib/language.php                   |  1 +
 locale/eo/LC_MESSAGES/statusnet.po | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 locale/eo/LC_MESSAGES/statusnet.po

diff --git a/lib/language.php b/lib/language.php
index d93e4e0ad..80d256807 100644
--- a/lib/language.php
+++ b/lib/language.php
@@ -310,6 +310,7 @@ function get_all_languages() {
         'da'      => array('q' => 0.8, 'lang' => 'da', 'name' => 'Danish', 'direction' => 'ltr'),
         'de'      => array('q' => 0.8, 'lang' => 'de', 'name' => 'German', 'direction' => 'ltr'),
         'el'      => array('q' => 0.1, 'lang' => 'el',    'name' => 'Greek', 'direction' => 'ltr'),
+        'eo'      => array('q' => 0.8, 'lang' => 'eo',    'name' => 'Esperanto', 'direction' => 'ltr'),
         'en-us'   => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'),
         'en-gb'   => array('q' => 1, 'lang' => 'en_GB', 'name' => 'English (British)', 'direction' => 'ltr'),
         'en'      => array('q' => 1, 'lang' => 'en',    'name' => 'English (US)', 'direction' => 'ltr'),
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
new file mode 100644
index 000000000..9fa7115cb
--- /dev/null
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -0,0 +1,24 @@
+# Translation of StatusNet to Esperanto
+# --
+# This file is distributed under the same license as the StatusNet package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: StatusNet\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-08-11 10:11+0000\n"
+"PO-Revision-Date: 2010-08-11 10:12:58+0000\n"
+"Language-Team: Esperanto\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: eo\n"
+"X-Message-Group: out-statusnet\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+msgid "Access"
+msgstr ""
-- 
cgit v1.2.3


From bd72ec8abc19743b0c47d9484c05622d2811c5c8 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Wed, 11 Aug 2010 12:55:05 +0200
Subject: Localisation updates from http://translatewiki.net

---
 locale/eo/LC_MESSAGES/statusnet.po | 7073 +++++++++++++++++++++++++++++++++++-
 locale/statusnet.pot               |    2 +-
 2 files changed, 7072 insertions(+), 3 deletions(-)

diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 9fa7115cb..5835365c9 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -1,4 +1,10 @@
 # Translation of StatusNet to Esperanto
+#
+# Author@translatewiki.net: AVRS
+# Author@translatewiki.net: Brion
+# Author@translatewiki.net: Ianmcorvidae
+# Author@translatewiki.net: Kris10
+# Author@translatewiki.net: LyzTyphone
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -6,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:58+0000\n"
+"POT-Creation-Date: 2010-08-11 10:48+0000\n"
+"PO-Revision-Date: 2010-08-11 10:49:34+0000\n"
 "Language-Team: Esperanto\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,4 +27,7067 @@ msgstr ""
 #. TRANS: Menu item for site administration
 #: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
 msgid "Access"
+msgstr "Atingo"
+
+#. TRANS: Page notice
+#: actions/accessadminpanel.php:67
+msgid "Site access settings"
+msgstr "Retejo-atinga agordo"
+
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161
+msgid "Registration"
+msgstr "Registrado"
+
+#. TRANS: Checkbox instructions for admin setting "Private"
+#: actions/accessadminpanel.php:165
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr "Ĉu malpermesi al anonimaj uzantoj (ne ensalutintaj) vidi retejon?"
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#: actions/accessadminpanel.php:167
+msgctxt "LABEL"
+msgid "Private"
+msgstr "Nepublika"
+
+#. TRANS: Checkbox instructions for admin setting "Invite only"
+#: actions/accessadminpanel.php:174
+msgid "Make registration invitation only."
+msgstr "Permesi registriĝon nur perinvitan."
+
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:176
+msgid "Invite only"
+msgstr "Nur per invito"
+
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
+#: actions/accessadminpanel.php:183
+msgid "Disable new registrations."
+msgstr "Malpermesi novan registriĝon."
+
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
+msgid "Closed"
+msgstr "Fermita"
+
+#. TRANS: Title / tooltip for button to save access settings in site admin panel
+#: actions/accessadminpanel.php:202
+msgid "Save access settings"
+msgstr "Konservu atingan agordon"
+
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
+msgctxt "BUTTON"
+msgid "Save"
+msgstr "Konservu"
+
+#. TRANS: Server error when page not found (404)
+#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
+#: actions/showfavorites.php:138 actions/tag.php:52
+msgid "No such page."
+msgstr "Ne estas tiu paĝo."
+
+#: actions/all.php:79 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:114
+#: actions/apiaccountupdateprofile.php:105
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
+#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
+#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
+#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
+#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:76 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
+msgid "No such user."
+msgstr "Ne ekzistas tiu uzanto."
+
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:90
+#, php-format
+msgid "%1$s and friends, page %2$d"
+msgstr "%1$s kaj amikoj, paĝo %2$d"
+
+#. TRANS: Page title. %1$s is user nickname
+#. TRANS: H1 text. %1$s is user nickname
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:93 actions/all.php:185 actions/allrss.php:116
+#: actions/apitimelinefriends.php:210 actions/apitimelinehome.php:116
+#: lib/personalgroupnav.php:100
+#, php-format
+msgid "%s and friends"
+msgstr "%s kaj amikoj"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:107
+#, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:116
+#, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:125
+#, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#. TRANS: %1$s is user nickname
+#: actions/all.php:138
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+"Tie ĉi estas la tempstrio de %s kaj amikoj sed ankoraŭ neniu afiŝis ion ajn."
+
+#: actions/all.php:143
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+"Provu aboni pli da homoj, [aniĝu al grupo] (%%action.groups%%) aŭ afiŝu ion "
+"vi mem."
+
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+#: actions/all.php:146
+#, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"Vi povas provi  [puŝeti %1$s](../%2$s) de lia profilo aŭ [afiŝi ion al li](%%"
+"%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
+msgstr ""
+"Kial ne [krei konton]](%%%%action.register%%%%) kaj poste puŝeti %s aŭ afiŝi "
+"avizon al li?"
+
+#. TRANS: H1 text
+#: actions/all.php:182
+msgid "You and friends"
+msgstr "Vi kaj amikoj"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:216
+#: actions/apitimelinehome.php:122
+#, php-format
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "Ĝisdatiĝoj de %1$s kaj amikoj ĉe %2$s!"
+
+#: actions/apiaccountratelimitstatus.php:72
+#: actions/apiaccountupdatedeliverydevice.php:94
+#: actions/apiaccountupdateprofile.php:97
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
+#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
+#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
+#: actions/apigroupshow.php:116 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
+#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
+#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
+#: actions/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
+msgid "API method not found."
+msgstr "Metodo de API ne troviĝas."
+
+#: actions/apiaccountupdatedeliverydevice.php:86
+#: actions/apiaccountupdateprofile.php:89
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
+#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
+#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
+#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
+#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
+#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+msgid "This method requires a POST."
+msgstr "Ĉi tiu metodo bezonas POST-on."
+
+#: actions/apiaccountupdatedeliverydevice.php:106
+msgid ""
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none."
+msgstr ""
+"Vi devas specifi parametron nomitan 'device' kun valoro de interalie: 'sms', "
+"'im', 'none'."
+
+#: actions/apiaccountupdatedeliverydevice.php:133
+msgid "Could not update user."
+msgstr "Malsukcesis ĝisdatigi uzanton"
+
+#: actions/apiaccountupdateprofile.php:112
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
+#: lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "La uzanto ne havas profilon."
+
+#: actions/apiaccountupdateprofile.php:147
+msgid "Could not save profile."
+msgstr "Malsukcesis konservi la profilon."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
+#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:123 actions/editapplication.php:118
+#: actions/newapplication.php:101 actions/newnotice.php:94
+#: lib/designsettings.php:283
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+"La servilo ne povis trakti tiom da POST-datumo (% bajtoj) pro ĝia nuna "
+"agordo."
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+msgid "Unable to save your design settings."
+msgstr "Malsukcesis konservi vian desegnan agordon"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+msgid "Could not update your design."
+msgstr "Malsukcesis ĝisdatigi vian desegnon."
+
+#: actions/apiblockcreate.php:105
+msgid "You cannot block yourself!"
+msgstr "Vi ne povas bloki vin mem!"
+
+#: actions/apiblockcreate.php:126
+msgid "Block user failed."
+msgstr "Ne sukcesis bloki uzanton."
+
+#: actions/apiblockdestroy.php:114
+msgid "Unblock user failed."
+msgstr "Ne sukcesis malbloki uzanton."
+
+#: actions/apidirectmessage.php:89
+#, php-format
+msgid "Direct messages from %s"
+msgstr "Rektaj mesaĝoj de %s"
+
+#: actions/apidirectmessage.php:93
+#, php-format
+msgid "All the direct messages sent from %s"
+msgstr "Ĉiuj rektaj mesaĝoj senditaj de %s"
+
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "Rektaj mesaĝoj al %s"
+
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "Ĉiuj rektaj mesaĝoj senditaj al %s"
+
+#: actions/apidirectmessagenew.php:118
+msgid "No message text!"
+msgstr "Sen mesaĝteksto!"
+
+#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "Tro longas. Mesaĝa longlimo estas %d signoj."
+
+#: actions/apidirectmessagenew.php:138
+msgid "Recipient user not found."
+msgstr "Ricevonta uzanto ne troviĝas."
+
+#: actions/apidirectmessagenew.php:142
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "Vi ne povas sendi rektan mesaĝon al uzanto kiu ne estas via amiko."
+
+#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apistatusesdestroy.php:121
+msgid "No status found with that ID."
+msgstr "Stato kun tiu ID ne trovitas."
+
+#: actions/apifavoritecreate.php:120
+msgid "This status is already a favorite."
+msgstr "Ĉi tiu stato jam estas  ŝatata."
+
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+msgid "Could not create favorite."
+msgstr "Malsukcesis krei ŝataton."
+
+#: actions/apifavoritedestroy.php:123
+msgid "That status is not a favorite."
+msgstr "La stato ne estas ŝatata."
+
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "Malsukcesis forigi ŝataton."
+
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: profile not found."
+msgstr "Malsukcesis aboni uzanton: profilo ne troviĝas."
+
+#: actions/apifriendshipscreate.php:118
+#, php-format
+msgid "Could not follow user: %s is already on your list."
+msgstr "Ne povas aboni uzanton: %s estas jam en via listo."
+
+#: actions/apifriendshipsdestroy.php:109
+msgid "Could not unfollow user: User not found."
+msgstr "Ne povas malaboni uzanton. Uzanto ne troviĝas."
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself."
+msgstr "Vi ne povas malaboni vin mem."
+
+#: actions/apifriendshipsexists.php:91
+msgid "Two valid IDs or screen_names must be supplied."
+msgstr "Du uzantajn IDojn aŭ montronomojn vi devas specifi."
+
+#: actions/apifriendshipsshow.php:134
+msgid "Could not determine source user."
+msgstr " Malsukcesis certigi fontan uzanton."
+
+#: actions/apifriendshipsshow.php:142
+msgid "Could not find target user."
+msgstr "Malsukcesis trovi celan uzanton."
+
+#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/newgroup.php:126 actions/profilesettings.php:215
+#: actions/register.php:212
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr ""
+"Kromnomo devas havi nur minuskulajn literojn kaj numerojn sed neniun spacon."
+
+#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/newgroup.php:130 actions/profilesettings.php:238
+#: actions/register.php:215
+msgid "Nickname already in use. Try another one."
+msgstr "La uzantnomo jam uziĝis. Provu ion alian."
+
+#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/newgroup.php:133 actions/profilesettings.php:218
+#: actions/register.php:217
+msgid "Not a valid nickname."
+msgstr "Ne valida kromnomo."
+
+#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/editgroup.php:199 actions/newapplication.php:203
+#: actions/newgroup.php:139 actions/profilesettings.php:222
+#: actions/register.php:224
+msgid "Homepage is not a valid URL."
+msgstr "Ĉefpaĝo ne estas valida URL."
+
+#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/newgroup.php:142 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Full name is too long (max 255 chars)."
+msgstr "Plennomo estas tro longa (maksimume 255 literoj)"
+
+#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/newapplication.php:172
+#, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "Priskribo estas tro longa (maksimume %d signoj)."
+
+#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/newgroup.php:148 actions/profilesettings.php:232
+#: actions/register.php:234
+msgid "Location is too long (max 255 chars)."
+msgstr "lokonomo estas tro longa (maksimume 255 literoj)"
+
+#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr "Tro da alinomoj! Maksimume %d."
+
+#: actions/apigroupcreate.php:267
+#, php-format
+msgid "Invalid alias: \"%s\"."
+msgstr "La alinomo estas nevalida: \"%*s\"."
+
+#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/newgroup.php:172
+#, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "La alinomo \"%s\" estas jam okupita. Provu ion alian."
+
+#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr "La alinomo devas ne esti sama al la kromnomo."
+
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
+#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
+msgid "Group not found."
+msgstr "Grupo ne troviĝas."
+
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+msgid "You are already a member of that group."
+msgstr "Vi estas jam grupano."
+
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+msgid "You have been blocked from that group by the admin."
+msgstr "La administranto blokis vin de tiu grupo."
+
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#, php-format
+msgid "Could not join user %1$s to group %2$s."
+msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
+
+#: actions/apigroupleave.php:115
+msgid "You are not a member of this group."
+msgstr "Vi ne estas grupano."
+
+#: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#, php-format
+msgid "Could not remove user %1$s from group %2$s."
+msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
+
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:98
+#, php-format
+msgid "%s's groups"
+msgstr "Grupoj de %s"
+
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:108
+#, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "Grupoj de %2$s ĉe %1$s."
+
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:92 actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr "Grupoj de %s"
+
+#: actions/apigrouplistall.php:96
+#, php-format
+msgid "groups on %s"
+msgstr "grupoj ĉe %s"
+
+#: actions/apimediaupload.php:99
+msgid "Upload failed."
+msgstr "Malsukcesis alŝuti"
+
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
+msgstr "Ne oauth_token parametro provizita."
+
+#: actions/apioauthauthorize.php:106
+msgid "Invalid token."
+msgstr "Nevalida ĵetono"
+
+#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/groupblock.php:66 actions/grouplogo.php:312
+#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/register.php:172 actions/remotesubscribe.php:77
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
+#: actions/subscribe.php:86 actions/tagother.php:166
+#: actions/unsubscribe.php:69 actions/userauthorization.php:52
+#: lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "Estis problemo pri via seanco. Bonvolu provi refoje."
+
+#: actions/apioauthauthorize.php:135
+msgid "Invalid nickname / password!"
+msgstr "Nevalida kromnomo / pasvorto!"
+
+#: actions/apioauthauthorize.php:159
+msgid "Database error deleting OAuth application user."
+msgstr "Datumbaza eraro forigi la uzanton de *OAuth-aplikaĵo."
+
+#: actions/apioauthauthorize.php:185
+msgid "Database error inserting OAuth application user."
+msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
+
+#: actions/apioauthauthorize.php:214
+#, php-format
+msgid ""
+"The request token %s has been authorized. Please exchange it for an access "
+"token."
+msgstr ""
+"La demanda ĵetono %s estis rajtigita. Bonvolu interŝanĝi ĝin por atinga "
+"ĵetono."
+
+#: actions/apioauthauthorize.php:227
+#, php-format
+msgid "The request token %s has been denied and revoked."
+msgstr "La demanda token %s estis neita kaj revokita."
+
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
+#: actions/smssettings.php:277 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "Neatendita formo-sendo."
+
+#: actions/apioauthauthorize.php:259
+msgid "An application would like to connect to your account"
+msgstr "Aplikaĵo volas konekti al via konto"
+
+#: actions/apioauthauthorize.php:276
+msgid "Allow or deny access"
+msgstr "Permesi aŭ malpermesi atingon"
+
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application <strong>%1$s</strong> by <strong>%2$s</strong> 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 ""
+"La aplikaĵo <strong>%1$s</strong> de <strong>%2$s</strong> volas la kapablon "
+"<strong>%3$s</strong> vian %4$s kontdatumon. Vi devas doni atingon nur al "
+"via %4$s konto al triaj partioj, kiujn vi fidas."
+
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:450
+msgid "Account"
+msgstr "Konto"
+
+#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/profilesettings.php:106 actions/register.php:431
+#: actions/showgroup.php:245 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
+#: lib/userprofile.php:132
+msgid "Nickname"
+msgstr "Kromnomo"
+
+#. TRANS: Link description in user account settings menu.
+#: actions/apioauthauthorize.php:316 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:125
+msgid "Password"
+msgstr "Pasvorto"
+
+#: actions/apioauthauthorize.php:328
+msgid "Deny"
+msgstr "Malpermesi"
+
+#: actions/apioauthauthorize.php:334
+msgid "Allow"
+msgstr "Permesi"
+
+#: actions/apioauthauthorize.php:351
+msgid "Allow or deny access to your account information."
+msgstr "Permesi aŭ malpermesi atingon al via kontdatumo."
+
+#: actions/apistatusesdestroy.php:112
+msgid "This method requires a POST or DELETE."
+msgstr "Ĉi tiu metodo bezonas POST aǔ DELETE."
+
+#: actions/apistatusesdestroy.php:135
+msgid "You may not delete another user's status."
+msgstr "Vi ne povas forigi la staton de alia uzanto."
+
+#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "Ne estas tiu avizo."
+
+#: actions/apistatusesretweet.php:83
+msgid "Cannot repeat your own notice."
+msgstr "Vi ne povas ripeti vian propran avizon."
+
+#: actions/apistatusesretweet.php:91
+msgid "Already repeated that notice."
+msgstr "La avizo jam ripetiĝis."
+
+#: actions/apistatusesshow.php:139
+msgid "Status deleted."
+msgstr "Stato forigita."
+
+#: actions/apistatusesshow.php:145
+msgid "No status with that ID found."
+msgstr "Neniu stato kun tiu ID troviĝas."
+
+#: actions/apistatusesupdate.php:221
+msgid "Client must provide a 'status' parameter with a value."
+msgstr "Kliento devas providi al \"stato\"-parametro valoron."
+
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: lib/mailhandler.php:60
+#, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "Tro longas. Aviza longlimo estas %*d signoj."
+
+#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+msgid "Not found."
+msgstr "Ne troviĝas."
+
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr "Aviza longlimo estas %d signoj, enkalkulante ankaŭ la retadresojn."
+
+#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+msgid "Unsupported format."
+msgstr "Formato ne subtenata."
+
+#: actions/apitimelinefavorites.php:110
+#, php-format
+msgid "%1$s / Favorites from %2$s"
+msgstr "%1$*s / Ŝatato de %2$*s"
+
+#: actions/apitimelinefavorites.php:119
+#, php-format
+msgid "%1$s updates favorited by %2$s / %2$s."
+msgstr "%1$*s ĝisdatigoj ŝatataj de %2$*s / %2$*s."
+
+#: actions/apitimelinementions.php:118
+#, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / Ĝisdatigoj kiuj mencias %2$s"
+
+#: actions/apitimelinementions.php:131
+#, php-format
+msgid "%1$s updates that reply to updates from %2$s / %3$s."
+msgstr "%1$s ĝisdatigoj kiuj respondas al ĝisdatigoj de %2$s / %3$s."
+
+#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s publika tempstrio"
+
+#: actions/apitimelinepublic.php:202 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "%s ĝisdatigoj de ĉiuj!"
+
+#: actions/apitimelineretweetedtome.php:111
+#, php-format
+msgid "Repeated to %s"
+msgstr "Ripetita al %s"
+
+#: actions/apitimelineretweetsofme.php:114
+#, php-format
+msgid "Repeats of %s"
+msgstr "Ripetoj de %s"
+
+#: actions/apitimelinetag.php:105 actions/tag.php:67
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "Avizoj etikeditaj %s"
+
+#: actions/apitimelinetag.php:107 actions/tagrss.php:65
+#, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
+
+#: actions/apitrends.php:87
+msgid "API method under construction."
+msgstr "API-metodo farata."
+
+#: actions/attachment.php:73
+msgid "No such attachment."
+msgstr "Ne estas tiu aldonaĵo."
+
+#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/groupmembers.php:76
+#: actions/grouprss.php:91 actions/showgroup.php:121
+msgid "No nickname."
+msgstr "Neniu kromnomo."
+
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr " Neniu grando."
+
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "Grando nevalida."
+
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118
+msgid "Avatar"
+msgstr "Vizaĝbildo"
+
+#: actions/avatarsettings.php:78
+#, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s."
+
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+msgid "User without matching profile."
+msgstr "Uzanto sen egala profilo."
+
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
+#: actions/grouplogo.php:254
+msgid "Avatar settings"
+msgstr "Vizaĝbilda agordo"
+
+#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
+#: actions/grouplogo.php:202 actions/grouplogo.php:262
+msgid "Original"
+msgstr "Originala"
+
+#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
+#: actions/grouplogo.php:213 actions/grouplogo.php:274
+msgid "Preview"
+msgstr "Antaŭrigardo"
+
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
+msgid "Delete"
+msgstr "Forigi"
+
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236
+msgid "Upload"
+msgstr "Alŝuti"
+
+#: actions/avatarsettings.php:231 actions/grouplogo.php:289
+msgid "Crop"
+msgstr "Tranĉi"
+
+#: actions/avatarsettings.php:305
+msgid "No file uploaded."
+msgstr "Neniu dosiero alŝutiĝas."
+
+#: actions/avatarsettings.php:332
+msgid "Pick a square area of the image to be your avatar"
+msgstr "Elektu kvadratan parton de la bildo kiel via vizaĝbildo"
+
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
+msgid "Lost our file data."
+msgstr "Perdiĝis nia dosiera datumo."
+
+#: actions/avatarsettings.php:370
+msgid "Avatar updated."
+msgstr "Vizaĝbildo ĝisdatigita."
+
+#: actions/avatarsettings.php:373
+msgid "Failed updating avatar."
+msgstr "Eraris ĝisdatigi vizaĝbildon."
+
+#: actions/avatarsettings.php:397
+msgid "Avatar deleted."
+msgstr "Vizaĝbildo forigita."
+
+#: actions/block.php:69
+msgid "You already blocked that user."
+msgstr "Vi jam blokis la uzanton."
+
+#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
+msgid "Block user"
+msgstr "Bloki uzanton"
+
+#: actions/block.php:138
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+"Ĉu vi certe volas bloki la uzanton? Poste, ili malaboniĝos de vi, ne povos "
+"aboni vin kaj vi ne ricevos avizon pro ilia ajna @-respondo."
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:153 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
+msgid "No"
+msgstr "Ne"
+
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:157 actions/deleteuser.php:156
+msgid "Do not block this user"
+msgstr "Ne bloki la uzanton"
+
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:160 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
+msgid "Yes"
+msgstr "Jes"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+msgid "Block this user"
+msgstr "Bloki la uzanton"
+
+#: actions/block.php:187
+msgid "Failed to save block information."
+msgstr "Eraris konservi blokado-informon."
+
+#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: actions/groupunblock.php:86 actions/joingroup.php:82
+#: actions/joingroup.php:93 actions/leavegroup.php:82
+#: actions/leavegroup.php:93 actions/makeadmin.php:86
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
+msgid "No such group."
+msgstr "Ne estas tiu grupo."
+
+#: actions/blockedfromgroup.php:97
+#, php-format
+msgid "%s blocked profiles"
+msgstr "%s profiloj blokitaj"
+
+#: actions/blockedfromgroup.php:100
+#, php-format
+msgid "%1$s blocked profiles, page %2$d"
+msgstr "%1$s profiloj blokitaj, paĝo %2$d"
+
+#: actions/blockedfromgroup.php:115
+msgid "A list of the users blocked from joining this group."
+msgstr "Listo de uzantoj blokita de aniĝi al ĉi tiun grupo."
+
+#: actions/blockedfromgroup.php:288
+msgid "Unblock user from group"
+msgstr "Malbloki uzanton de grupo"
+
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "Malbloki"
+
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+msgid "Unblock this user"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, php-format
+msgid "Post to %s"
+msgstr "Sendi al %s"
+
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "Neniu konfirma kodo."
+
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "Konfirma kodo ne trovitas."
+
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "Tiu komfirmnumero ne estas por vi!"
+
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
+#, php-format
+msgid "Unrecognized address type %s."
+msgstr "Nerekonata adrestipo %s."
+
+#. TRANS: Client error for an already confirmed email/jabbel/sms address.
+#: actions/confirmaddress.php:96
+msgid "That address has already been confirmed."
+msgstr "La adreso jam estis konfirmita."
+
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
+msgid "Couldn't update user."
+msgstr "Ne povus ĝisdatigi uzanton."
+
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
+msgid "Couldn't delete email confirmation."
+msgstr "Ne povas forigi retpoŝtan konfirmon."
+
+#: actions/confirmaddress.php:146
+msgid "Confirm address"
+msgstr "Konfirmi retadreson"
+
+#: actions/confirmaddress.php:161
+#, php-format
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "Adreso \"%s\" nun konfirmitas je via konto."
+
+#: actions/conversation.php:99
+msgid "Conversation"
+msgstr "Konversacio"
+
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+msgid "Notices"
+msgstr "Avizoj"
+
+#: actions/deleteapplication.php:63
+msgid "You must be logged in to delete an application."
+msgstr "Ensalutu por forigi la aplikaĵon."
+
+#: actions/deleteapplication.php:71
+msgid "Application not found."
+msgstr "Aplikaĵo ne trovita."
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+msgid "You are not the owner of this application."
+msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1263
+msgid "There was a problem with your session token."
+msgstr "Problemo okazas pri via seancĵetono."
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+msgid "Delete application"
+msgstr "Forigi aplikaĵon"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+"Ĉu vi certe volas forigi la aplikaĵon? Ĉiu datumo pri la aplikaĵo viŝiĝos de "
+"la datumbazo, inkluzive de ĉiu ekzistanta uzanto-konekto."
+
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
+msgid "Do not delete this application"
+msgstr "Ne forigu ĉi tiun aplikaĵon."
+
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
+msgid "Delete this application"
+msgstr "Viŝi ĉi tiun aplikon"
+
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
+#: actions/tagother.php:33 actions/unsubscribe.php:52
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "Ne konektita."
+
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "Ne povas forigi ĉi tiun avizon."
+
+#: actions/deletenotice.php:103
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr ""
+"Vi nun por ĉiam forigos avizon. Kiam tio fariĝos, ne plu eblos malfari tion."
+
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "Forigi avizon"
+
+#: actions/deletenotice.php:144
+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.
+#: actions/deletenotice.php:151
+msgid "Do not delete this notice"
+msgstr "Ne forigi la avizon"
+
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:657
+msgid "Delete this notice"
+msgstr "Forigi la avizon"
+
+#: actions/deleteuser.php:67
+msgid "You cannot delete users."
+msgstr "Vi ne povas forigi uzantojn."
+
+#: actions/deleteuser.php:74
+msgid "You can only delete local users."
+msgstr "Vi povas forigi nur lokan uzanton."
+
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+msgid "Delete user"
+msgstr "Forigi uzanton"
+
+#: actions/deleteuser.php:136
+msgid ""
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
+"Ĉu vi certe volas forigi la uzanton? Ĉiu datumo pri la uzanto viŝiĝos de la "
+"datumbazo sen sekurkopio."
+
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+msgid "Delete this user"
+msgstr "Forigi la uzanton"
+
+#. TRANS: Message used as title for design settings for the site.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: lib/groupnav.php:119
+msgid "Design"
+msgstr "Aspekto"
+
+#: actions/designadminpanel.php:74
+msgid "Design settings for this StatusNet site."
+msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+
+#: actions/designadminpanel.php:318
+msgid "Invalid logo URL."
+msgstr "URL por la emblemo nevalida."
+
+#: actions/designadminpanel.php:322
+#, php-format
+msgid "Theme not available: %s."
+msgstr "Desegno ne havebla: %s."
+
+#: actions/designadminpanel.php:426
+msgid "Change logo"
+msgstr "Ŝanĝi emblemon"
+
+#: actions/designadminpanel.php:431
+msgid "Site logo"
+msgstr "Reteja emblemo"
+
+#: actions/designadminpanel.php:443
+msgid "Change theme"
+msgstr "Ŝanĝi desegnon"
+
+#: actions/designadminpanel.php:460
+msgid "Site theme"
+msgstr "Reteja desegno"
+
+#: actions/designadminpanel.php:461
+msgid "Theme for the site."
+msgstr "Desegno por la retejo"
+
+#: actions/designadminpanel.php:467
+msgid "Custom theme"
+msgstr "Propra desegno"
+
+#: actions/designadminpanel.php:471
+msgid "You can upload a custom StatusNet theme as a .ZIP archive."
+msgstr "Vi povas alŝuti propran StatusNet-desegnon kiel .zip-dosiero"
+
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
+msgid "Change background image"
+msgstr "Ŝanĝi fonbildon"
+
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr "Fono"
+
+#: actions/designadminpanel.php:496
+#, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "Vi povas alŝuti fonbildon por la retejo. Dosiero-grandlimo estas %1$s."
+
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:527 lib/designsettings.php:139
+msgid "On"
+msgstr "En"
+
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:544 lib/designsettings.php:155
+msgid "Off"
+msgstr "For"
+
+#: actions/designadminpanel.php:545 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr "Aktivigi aŭ senaktivigi fonbildon"
+
+#: actions/designadminpanel.php:550 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr "Ripeti la fonbildon"
+
+#: actions/designadminpanel.php:564 lib/designsettings.php:170
+msgid "Change colours"
+msgstr "Ŝanĝi kolorojn"
+
+#: actions/designadminpanel.php:587 lib/designsettings.php:191
+msgid "Content"
+msgstr "Enhavo"
+
+#: actions/designadminpanel.php:600 lib/designsettings.php:204
+msgid "Sidebar"
+msgstr "Flanka strio"
+
+#: actions/designadminpanel.php:613 lib/designsettings.php:217
+msgid "Text"
+msgstr "Teksto"
+
+#: actions/designadminpanel.php:626 lib/designsettings.php:230
+msgid "Links"
+msgstr "Ligiloj"
+
+#: actions/designadminpanel.php:651
+msgid "Advanced"
+msgstr "Speciala"
+
+#: actions/designadminpanel.php:655
+msgid "Custom CSS"
+msgstr "Propra CSS"
+
+#: actions/designadminpanel.php:676 lib/designsettings.php:247
+msgid "Use defaults"
+msgstr "Uzu defaŭlton"
+
+#: actions/designadminpanel.php:677 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr "Restaŭri defaŭltajn desegnojn"
+
+#: actions/designadminpanel.php:683 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr "Redefaŭltiĝi"
+
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:685 actions/othersettings.php:126
+#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "Konservi"
+
+#: actions/designadminpanel.php:686 lib/designsettings.php:257
+msgid "Save design"
+msgstr "Savi desegnon"
+
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "Ĉi tiu avizo ne estas preferita"
+
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "Aldoni al ŝatolisto"
+
+#: actions/doc.php:158
+#, php-format
+msgid "No such document \"%s\""
+msgstr "Ne estas tia dokumento \"%s\""
+
+#: actions/editapplication.php:54
+msgid "Edit Application"
+msgstr "Redakti Aplikon"
+
+#: actions/editapplication.php:66
+msgid "You must be logged in to edit an application."
+msgstr "Ensalutu por redakti la aplikaĵon."
+
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#: actions/showapplication.php:87
+msgid "No such application."
+msgstr "Ne estas tia aplikaĵo."
+
+#: actions/editapplication.php:161
+msgid "Use this form to edit your application."
+msgstr "Uzu ĉi tiun formularon por redakti vian aplikaĵon."
+
+#: actions/editapplication.php:177 actions/newapplication.php:159
+msgid "Name is required."
+msgstr "Nomo necesas."
+
+#: actions/editapplication.php:180 actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "La nomo estas tro longa (maksimume 255 literoj)"
+
+#: actions/editapplication.php:183 actions/newapplication.php:162
+msgid "Name already in use. Try another one."
+msgstr "La nomo jam uziĝis. Provu ion alian."
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
+msgid "Description is required."
+msgstr "Priskribo necesas."
+
+#: actions/editapplication.php:194
+msgid "Source URL is too long."
+msgstr "Fonta URL estas tro longa."
+
+#: actions/editapplication.php:200 actions/newapplication.php:185
+msgid "Source URL is not valid."
+msgstr "Fonta URL estas nevalida."
+
+#: actions/editapplication.php:203 actions/newapplication.php:188
+msgid "Organization is required."
+msgstr "Organizo necesas."
+
+#: actions/editapplication.php:206 actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "Organizonomo estas tro longa (maksimume 255 literoj)."
+
+#: actions/editapplication.php:209 actions/newapplication.php:194
+msgid "Organization homepage is required."
+msgstr "Organiza ĉefpaĝo bezoniĝas."
+
+#: actions/editapplication.php:218 actions/newapplication.php:206
+msgid "Callback is too long."
+msgstr "Revokfunkcio estas tro longa."
+
+#: actions/editapplication.php:225 actions/newapplication.php:215
+msgid "Callback URL is not valid."
+msgstr "Revokfunkcia URL estas nevalida."
+
+#: actions/editapplication.php:258
+msgid "Could not update application."
+msgstr "Malsukcesis ĝisdatigi la aplikaĵon."
+
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "Redakti %s grupon"
+
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "Ensalutu por krei grupon."
+
+#: actions/editgroup.php:107 actions/editgroup.php:172
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+msgid "You must be an admin to edit the group."
+msgstr "Vi devas esti administranto por redakti la grupon."
+
+#: actions/editgroup.php:158
+msgid "Use this form to edit the group."
+msgstr "Uzas ĉi tiun formularon por redakti la grupon."
+
+#: actions/editgroup.php:205 actions/newgroup.php:145
+#, php-format
+msgid "description is too long (max %d chars)."
+msgstr "Priskribo estas tro longa (maksimume %d signoj)."
+
+#: actions/editgroup.php:228 actions/newgroup.php:168
+#, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "Nevalida alinomo: \"%s\""
+
+#: actions/editgroup.php:258
+msgid "Could not update group."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Server exception thrown when creating group aliases failed.
+#: actions/editgroup.php:264 classes/User_group.php:514
+msgid "Could not create aliases."
+msgstr "Malsukcesis krei alinomon."
+
+#: actions/editgroup.php:280
+msgid "Options saved."
+msgstr "Elektoj konserviĝis."
+
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
+msgid "Email settings"
+msgstr "Retpoŝta agordo"
+
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "Administri kiel ricevi mesaĝon de  %%site.name%%."
+
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Retpoŝtadreso"
+
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
+msgid "Current confirmed email address."
+msgstr "Nuna konfirmita retpoŝtadreso."
+
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
+msgid "Remove"
+msgstr "Forigi"
+
+#: actions/emailsettings.php:122
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"Atendanta konfirmon pri ĉi tiu adreso. Kontrolu vian alvenkeston (kaj "
+"spamkeston!) pri mesaĝo kun plua instrukcio."
+
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
+msgid "Cancel"
+msgstr "Nuligi"
+
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
+msgid "Email address, like \"UserName@example.org\""
+msgstr "Retpoŝtadreso, ekzemple \"ViaNomo@example.org\""
+
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
+msgid "Add"
+msgstr "Aldoni"
+
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
+msgid "Incoming email"
+msgstr "Alveninta poŝto"
+
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
+msgid "Send email to this address to post new notices."
+msgstr "Sendu mesaĝon al la adreso por afiŝi novan avizon."
+
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "Krei novan retpoŝtadreson por afiŝado kaj nuligi la antaŭan."
+
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
+msgid "New"
+msgstr "Nova"
+
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"
+msgstr "Retpoŝta agordo."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
+msgid "Send me notices of new subscriptions through email."
+msgstr "Sendu al mi avizon pri nova abonado per retpoŝto."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "Sendu al mi mesaĝon tiam, kiam iu ŝatas mian avizon ."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
+msgid "Send me email when someone sends me a private message."
+msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi privatan mesaĝon."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "Sendu al mi mesaĝon tiam, kiam iu sendas al mi \"@-respondon\"."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
+msgid "Allow friends to nudge me and send me an email."
+msgstr "Permesi al amikoj puŝeti min kaj sendi al mi retpoŝtan mesaĝon."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
+msgid "I want to post notices by email."
+msgstr "Mi volas afiŝi avizon per retpoŝto."
+
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
+msgid "Publish a MicroID for my email address."
+msgstr "Publikigi MikroID por mia retpoŝtadreso."
+
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
+msgstr "Retpoŝta prefero konserviĝis."
+
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
+msgid "No email address."
+msgstr "Neniu retpoŝta adreso."
+
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
+msgid "Cannot normalize that email address"
+msgstr "Malsukcesis normigi tiun retpoŝtadreson"
+
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/siteadminpanel.php:144
+msgid "Not a valid email address."
+msgstr "Retpoŝta adreso ne valida"
+
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
+msgid "That is already your email address."
+msgstr "Tiu jam estas via retpoŝtadreso."
+
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
+msgid "That email address already belongs to another user."
+msgstr "Tiu retpoŝtadreso jam apartenas al alia uzanto."
+
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
+msgid "Couldn't insert confirmation code."
+msgstr "Malsukcesis enmeti konfirmkodon."
+
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
+msgid ""
+"A confirmation code was sent to the email address you added. Check your "
+"inbox (and spam box!) for the code and instructions on how to use it."
+msgstr ""
+"Konfirmkodo jam senditas al la aldonita retpoŝtadreso. Kontrolu vian "
+"alvenkeston (kaj spamkeston!) pri la kodo kaj instrukcio pri kiel uzi ĝin."
+
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
+msgid "No pending confirmation to cancel."
+msgstr "Ne estas peto-konfirmo por nuligi."
+
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."
+msgstr "Tiu retpoŝtadreso estas malĝusta."
+
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."
+msgstr "Retpoŝta konfirmo nuligita."
+
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
+msgid "That is not your email address."
+msgstr "Tiu ne estas via retpoŝtadreso."
+
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."
+msgstr "La retpoŝtadreso estas forigita."
+
+#: actions/emailsettings.php:493 actions/smssettings.php:568
+msgid "No incoming email address."
+msgstr "Ne estas alvena retpoŝtadreso"
+
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
+msgid "Couldn't update user record."
+msgstr "Malsukcesis ĝisdatigi uzantan informon."
+
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
+msgid "Incoming email address removed."
+msgstr "Alvena retpoŝtadreso forigita."
+
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
+msgid "New incoming email address added."
+msgstr "Nova alvena retpoŝtadreso aldonita."
+
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "Ĉi tiu avizo jam estas ŝatata."
+
+#: actions/favor.php:92 lib/disfavorform.php:140
+msgid "Disfavor favorite"
+msgstr "Malŝati ŝataton."
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
+#: lib/publicgroupnav.php:93
+msgid "Popular notices"
+msgstr "Populara avizo"
+
+#: actions/favorited.php:67
+#, php-format
+msgid "Popular notices, page %d"
+msgstr "Populara avizo, paĝo %d"
+
+#: actions/favorited.php:79
+msgid "The most popular notices on the site right now."
+msgstr "Nunaj plej popularaj avizoj ĉe ĉi tiu retejo."
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr "Ŝatataj avizoj aperos ĉi-paĝe sed ankoraŭ nenio ŝatiĝas."
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+"Fariĝu la unua, kiu aldonis avizon al sia ŝatolisto, per alklako de la ŝato-"
+"klavo apud iu ajn avizo, kiun vi ŝatas."
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+"[Kreu konton](%%action.register%%) kaj estu la unua, kiu aldonos avizon al "
+"sia ŝatolisto!"
+
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
+#, php-format
+msgid "%s's favorite notices"
+msgstr "Ŝatataj avizoj de %s"
+
+#: actions/favoritesrss.php:115
+#, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "Ŝatataj Ĝisdatiĝoj de %1$s ĉe %2$s!"
+
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "Elstaraj uzantoj"
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "Elstaraj uzantoj, paĝo %d"
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some great users on %s"
+msgstr "Elekto de kelke da elstaraj uzantoj ĉe %s"
+
+#: actions/file.php:34
+msgid "No notice ID."
+msgstr "Ne estas avizo-ID"
+
+#: actions/file.php:38
+msgid "No notice."
+msgstr "Ne estas avizo."
+
+#: actions/file.php:42
+msgid "No attachments."
+msgstr "Ne estas aldonaĵo."
+
+#: actions/file.php:51
+msgid "No uploaded attachments."
+msgstr "Ne estas alŝutita aldonaĵo."
+
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "Neatendita respondo!"
+
+#: actions/finishremotesubscribe.php:80
+msgid "User being listened to does not exist."
+msgstr "Vizitata uzanto ne ekzistas."
+
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "Vi povas aboni loke!"
+
+#: actions/finishremotesubscribe.php:99
+msgid "That user has blocked you from subscribing."
+msgstr "Tiu uzanto abonblokis vin."
+
+#: actions/finishremotesubscribe.php:110
+msgid "You are not authorized."
+msgstr "Vi ne estas rajtigita."
+
+#: actions/finishremotesubscribe.php:113
+msgid "Could not convert request token to access token."
+msgstr "Malsukcesis interŝanĝi petĵetonon al atingoĵetono."
+
+#: actions/finishremotesubscribe.php:118
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "Fora servo uzas nekonatan version de OMB-protokolo."
+
+#: actions/finishremotesubscribe.php:138
+msgid "Error updating remote profile."
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: actions/getfile.php:79
+msgid "No such file."
+msgstr "Ne ekzistas tia dosiero."
+
+#: actions/getfile.php:83
+msgid "Cannot read file."
+msgstr "Malsukcesis legi dosieron."
+
+#: actions/grantrole.php:62 actions/revokerole.php:62
+msgid "Invalid role."
+msgstr "Rolo nevalida."
+
+#: actions/grantrole.php:66 actions/revokerole.php:66
+msgid "This role is reserved and cannot be set."
+msgstr "Tiu ĉi rolo estas rezervita, do ne povas esti asignita."
+
+#: actions/grantrole.php:75
+msgid "You cannot grant user roles on this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#: actions/grantrole.php:82
+msgid "User already has this role."
+msgstr "Uzanto jam havas la rolon."
+
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:79
+msgid "No profile specified."
+msgstr "Neniu profilo elektita."
+
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+msgid "No profile with that ID."
+msgstr "Ne estas profilo kun tiu ID."
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+msgid "No group specified."
+msgstr "Neniu grupo elektita."
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr "Nur administranto rajtas bloki grupanon."
+
+#: actions/groupblock.php:95
+msgid "User is already blocked from group."
+msgstr "La uzanto jam de grupo blokiĝas."
+
+#: actions/groupblock.php:100
+msgid "User is not a member of group."
+msgstr "La uzanto ne estas grupano."
+
+#: actions/groupblock.php:134 actions/groupmembers.php:360
+msgid "Block user from group"
+msgstr "Bloki uzanton de grupo"
+
+#: actions/groupblock.php:160
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
+"will be removed from the group, unable to post, and unable to subscribe to "
+"the group in the future."
+msgstr ""
+"Ĉu vi certe volas forbari uzanton \"%1$s\" de la grupo \"%2$s\"? Li estos "
+"forigita de la grupo, ne povos afiŝi, kaj ne povos aboni la grupon."
+
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
+msgid "Do not block this user from this group"
+msgstr "Ne bloki la uzanton de la grupo"
+
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
+msgid "Block this user from this group"
+msgstr "Bloki la uzanton de la grupo"
+
+#: actions/groupblock.php:206
+msgid "Database error blocking user from group."
+msgstr "Malsukcesis forbari uzanton de la grupo pro datumbaza eraro."
+
+#: actions/groupbyid.php:74 actions/userbyid.php:70
+msgid "No ID."
+msgstr "Neniu ID."
+
+#: actions/groupdesignsettings.php:68
+msgid "You must be logged in to edit a group."
+msgstr "Ensalutu por redakti grupon."
+
+#: actions/groupdesignsettings.php:144
+msgid "Group design"
+msgstr "Grupa desegno"
+
+#: actions/groupdesignsettings.php:155
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr "Agordi kiel aspektu via grupo, kun elekto de fonbildo kaj koloraro."
+
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
+#: lib/designsettings.php:391 lib/designsettings.php:413
+msgid "Couldn't update your design."
+msgstr "Malsukcesis ĝisdatigi vian desegnon."
+
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+msgid "Design preferences saved."
+msgstr "Desegna agordo konservita."
+
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
+msgid "Group logo"
+msgstr "Grupa emblemo"
+
+#: actions/grouplogo.php:153
+#, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr ""
+"Vi povas alŝuti emblemo-bildon por via grupo. Dosiero-grandlimo estas $s."
+
+#: actions/grouplogo.php:365
+msgid "Pick a square area of the image to be the logo."
+msgstr "Elektu kvadratan parton de la bildo kiel la emblemo."
+
+#: actions/grouplogo.php:399
+msgid "Logo updated."
+msgstr "Emblemo ĝisdatigita."
+
+#: actions/grouplogo.php:401
+msgid "Failed updating logo."
+msgstr "Malsukcesis ĝisdatigi emblemon."
+
+#: actions/groupmembers.php:100 lib/groupnav.php:92
+#, php-format
+msgid "%s group members"
+msgstr "%s grupanoj"
+
+#: actions/groupmembers.php:103
+#, php-format
+msgid "%1$s group members, page %2$d"
+msgstr "%1$s grupanoj, paĝo %2$d"
+
+#: actions/groupmembers.php:118
+msgid "A list of the users in this group."
+msgstr "Listo de uzantoj en tiu ĉi grupo"
+
+#: actions/groupmembers.php:182 lib/groupnav.php:107
+msgid "Admin"
+msgstr "Administranto"
+
+#: actions/groupmembers.php:392 lib/blockform.php:69
+msgid "Block"
+msgstr "Bloki"
+
+#: actions/groupmembers.php:487
+msgid "Make user an admin of the group"
+msgstr "Elekti uzanton grupestro."
+
+#: actions/groupmembers.php:519
+msgid "Make Admin"
+msgstr "Estrigi"
+
+#: actions/groupmembers.php:519
+msgid "Make this user an admin"
+msgstr "Estrigi la uzanton"
+
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#, php-format
+msgid "%s timeline"
+msgstr "Tempstrio de %s"
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
+#, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "Ĝisdatigoj de grupano de %1$s ĉe %2$s!"
+
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "Grupoj"
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "Grupoj, paĝo %d"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+"En %%%%site.name%%%% grupoj povas vi babili kun personoj kun similaj "
+"interesoj. Post kiam vi aliĝas al grupo vi povos sendi mesaĝon per sintakso"
+"\"!groupname\" al ĉiu alia ano. Ĉu vi ne vidas ŝatindan grupon? Provu [serĉi]"
+"(%%%%action.groupsearch%%%%) aŭ [kreu vian propran grupon!](%%%%action."
+"newgroup%%%%)"
+
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+msgid "Create a new group"
+msgstr "Krei novan grupon"
+
+#: actions/groupsearch.php:52
+#, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Serĉi grupon ĉe %%site.name%% per ĝia nomo, loko, aŭ priskribo. Dividu "
+"serĉvortojn per spaco; ili estu almenaŭ 3 literojn longaj."
+
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "Grup-serĉo"
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+msgid "No results."
+msgstr "Neniu rezulto."
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+"Se vi ne trovas grupon, kiun vi serĉas, vi povas mem [krei ĝin](%%action."
+"newgroup%%)."
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+"Kial ne [krei konton](%%action.register%%) kaj mem [krei la grupon](%%action."
+"newgroup%%)!"
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr "Nur grupestro rajtas malbloki grupanon."
+
+#: actions/groupunblock.php:95
+msgid "User is not blocked from group."
+msgstr "La uzanto ne estas blokita de grupo."
+
+#: actions/groupunblock.php:128 actions/unblock.php:86
+msgid "Error removing the block."
+msgstr "Eraro ĉe provo malbloki."
+
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
+msgid "IM settings"
+msgstr "Tujmesaĝila agordo."
+
+#. 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.
+#: actions/imsettings.php:74
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"Vi povas sendi kaj ricevi avizojn per Jabber/GTalk-[tujmesaĝiloj](%%doc.im%"
+"%). Jen agordu vian adreson kaj ceteron."
+
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
+msgid "IM is not available."
+msgstr "Tujmesaĝilo ne estas disponebla."
+
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Tujmesaĝila adreso"
+
+#: actions/imsettings.php:113
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "Nuna konfirmita Jabber/GTalk-adreso."
+
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
+#, php-format
+msgid ""
+"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
+"message with further instructions. (Did you add %s to your buddy list?)"
+msgstr ""
+"Atendante konfirmon por la adreso. Kontrolu vian Jabber/GTalk-konton por "
+"mesaĝo kun pli da gvido. (Ĉu vi aldonis %s al via amikolisto?)"
+
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
+#, php-format
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+"Jabber/GTalk-adreso, ekzemple \"UserName@example.org\". Unue, certe aldonu %"
+"s al via amikolisto je via tujmesaĝilo-kliento aŭ je GTalk."
+
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr "Tujmesaĝilaj preferoj"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
+msgid "Send me notices through Jabber/GTalk."
+msgstr "Sendu al mi avizojn per Jabber/GTalk."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "Afiŝu avizon tiam, kiam mia Jabber/GTalk-stato ŝanĝiĝas."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr ""
+"Sendu al mi per Jabber/GTalk respondojn de personoj, kiujn mi ne abonas."
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "Publikigu MikroID por mia Jabber/GTalk-adreso."
+
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Prefero konservita."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
+msgid "No Jabber ID."
+msgstr "Mankas Jabber-ID."
+
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
+msgid "Cannot normalize that Jabber ID"
+msgstr "Malsukcesis normigi la Jabber-ID"
+
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
+msgid "Not a valid Jabber ID"
+msgstr "Tio ne estas valida Jabber-ID"
+
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
+msgid "That is already your Jabber ID."
+msgstr "Tio estas jam via Jabber-ID."
+
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber-ID jam apartenas al alia uzanto."
+
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr ""
+"Konfirmo-kodo senditas al la tujmesaĝila adreso aldonita. Vi devas permesi "
+"al %s sendi mesaĝojn al vi."
+
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Tiu tujmesaĝila adreso estas malĝusta."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr "Malsukcesis forigi tujmesaĝila agordo."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr "Tujmesaĝila konfirmo nuligita."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
+msgid "That is not your Jabber ID."
+msgstr "Tio ne estas via Jabber-ID."
+
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr "La tujmesaĝila adreso estas forigita."
+
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %1$s - page %2$d"
+msgstr "Alvenkesto de %1$s - paĝo %2$d"
+
+#: actions/inbox.php:62
+#, php-format
+msgid "Inbox for %s"
+msgstr "Alvenkesto de %s"
+
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr ""
+"Tio ĉi estas via alvenkesto, kie listiĝas viaj alvenaj privataj mesaĝoj."
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr "Invito estas malebligita."
+
+#: actions/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s."
+msgstr "Ensalutu por inviti aliajn uzantojn al %s."
+
+#: actions/invite.php:72
+#, php-format
+msgid "Invalid email address: %s"
+msgstr "Nevalida retpoŝtadreso:  %s"
+
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "Invito(j) senditas"
+
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "Inviti novajn uzantojn"
+
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "Vi jam abonas jenajn uzantojn:"
+
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: actions/invite.php:136
+msgid ""
+"These people are already users and you were automatically subscribed to them:"
+msgstr "Jenaj personoj estas jam uzantoj kaj vin aŭtomate abonigis al ili."
+
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "Invito(j) sendiĝis al jenaj personoj:"
+
+#: actions/invite.php:150
+msgid ""
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr ""
+"Vi sciiĝos, kiam viaj invititoj akceptos la inviton kaj registriĝos ĉe la "
+"retejo. Dankon por kreskigi la komunumon!"
+
+#: actions/invite.php:162
+msgid ""
+"Use this form to invite your friends and colleagues to use this service."
+msgstr ""
+"Uzu la formularon por inviti viajn amikojn kaj kolegojn al ĉi tiu servo."
+
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "Retpoŝtadresoj"
+
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "Adresoj de invitataj amikoj (unu por linio)"
+
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "Persona mesaĝo"
+
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "Vi povas aldoni personan mesaĝon al la invito."
+
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:198
+msgctxt "BUTTON"
+msgid "Send"
+msgstr "Sendi"
+
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s invitis vin kunaliĝi ĉe %2$s"
+
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
+#, php-format
+msgid ""
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
+msgstr ""
+"%1$s invitas vin al %2$s (%3$s).\n"
+"\n"
+"%2$s estas mikrobloga servo, kiu ebligas al vi ĝisdate komuniki kun konatojn "
+"kaj la interesajn.\n"
+"\n"
+"Vi povas ankaŭ konigi novaĵon pri vi mem, vian penson, aŭ vian vivon enretan "
+"kun persono, kiu komprenas vin. Vi ankaŭ povas per ĝi koniĝi kun novan "
+"saminteresannon.\n"
+"\n"
+"%1$s diras:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Vi povas vidi profilo de %1$s ĉe %2$s ĉi tie:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Se vi volas provi la servon, alklaku jenan ligilon por akcepti la inviton.\n"
+"\n"
+"%6$s\n"
+"\n"
+"Aŭ, vi povas ingnori la mesaĝon. Dankon por via pacienco kaj tempo.\n"
+"\n"
+"via sincere, %2$s\n"
+
+#: actions/joingroup.php:60
+msgid "You must be logged in to join a group."
+msgstr "Ensalutu por aniĝi al grupo."
+
+#: actions/joingroup.php:88 actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "Ne estas alinomo aŭ ID."
+
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
+#, php-format
+msgid "%1$s joined group %2$s"
+msgstr "%1$s aniĝis al grupo %2$s"
+
+#: actions/leavegroup.php:60
+msgid "You must be logged in to leave a group."
+msgstr "Ensalutu por eksaniĝi."
+
+#: actions/leavegroup.php:100 lib/command.php:373
+msgid "You are not a member of that group."
+msgstr "Vi ne estas grupano."
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
+#, php-format
+msgid "%1$s left group %2$s"
+msgstr "%1$s eksaniĝis de grupo %2$s"
+
+#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
+msgid "Already logged in."
+msgstr "Vi jam ensalutis."
+
+#: actions/login.php:148
+msgid "Incorrect username or password."
+msgstr "Malĝusta uzantnomo aŭ pasvorto."
+
+#: actions/login.php:154 actions/otp.php:120
+msgid "Error setting user. You are probably not authorized."
+msgstr "Eraras agordi uzanton. Vi verŝajne ne rajtiĝas."
+
+#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+msgid "Login"
+msgstr "Ensaluti"
+
+#: actions/login.php:249
+msgid "Login to site"
+msgstr "Ensaluti al la retejo"
+
+#: actions/login.php:258 actions/register.php:485
+msgid "Remember me"
+msgstr "Memoru min"
+
+#: actions/login.php:259 actions/register.php:487
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "Aŭtomate ensaluti estonte; ne taŭge por komuna komputilo!"
+
+#: actions/login.php:269
+msgid "Lost or forgotten password?"
+msgstr "Ĉi via pasvorto perdiĝas?"
+
+#: actions/login.php:288
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr ""
+"Por sekureca kialo, bonvole re-entajpi vian uzantnomon kaj pasvorton antaŭ "
+"ŝanĝi vian agordon."
+
+#: actions/login.php:292
+msgid "Login with your username and password."
+msgstr "Ensaluti per via uzantnomo kaj pasvorto."
+
+#: actions/login.php:295
+#, php-format
+msgid ""
+"Don't have a username yet? [Register](%%action.register%%) a new account."
+msgstr "Ĉu sen uzantnomo? [Kreu](%%action.register%%) novan konton."
+
+#: actions/makeadmin.php:92
+msgid "Only an admin can make another user an admin."
+msgstr "Nur administranto rajtas administrantigi uzanton."
+
+#: actions/makeadmin.php:96
+#, php-format
+msgid "%1$s is already an admin for group \"%2$s\"."
+msgstr "%1$s estas jam grupestro de \"%2$s\"."
+
+#: actions/makeadmin.php:133
+#, php-format
+msgid "Can't get membership record for %1$s in group %2$s."
+msgstr "Malsukcesis kolekti ano-historio de %1$s en grupo %2$s."
+
+#: actions/makeadmin.php:146
+#, php-format
+msgid "Can't make %1$s an admin for group %2$s."
+msgstr "Malsukcesis estrigi  %1$s por grupo %2$s."
+
+#: actions/microsummary.php:69
+msgid "No current status."
+msgstr "Ne estas kuranta stato."
+
+#: actions/newapplication.php:52
+msgid "New Application"
+msgstr "Nova Apliko"
+
+#: actions/newapplication.php:64
+msgid "You must be logged in to register an application."
+msgstr "Ensalutu por registri aplikaĵon."
+
+#: actions/newapplication.php:143
+msgid "Use this form to register a new application."
+msgstr "Uzu ĉi tiun formularon por registri novan aplikaĵon."
+
+#: actions/newapplication.php:176
+msgid "Source URL is required."
+msgstr "Fonta URL bezonata."
+
+#: actions/newapplication.php:258 actions/newapplication.php:267
+msgid "Could not create application."
+msgstr "Malsukcesis krei aplikaĵon."
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "Nova grupo"
+
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "Uzas ĉi tiun formularon por krei novan grupon."
+
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "Nova mesaĝo"
+
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+msgid "You can't send a message to this user."
+msgstr "Vi ne povas sendi mesaĝon al la uzanto."
+
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
+msgid "No content!"
+msgstr "Neniu enhavo!"
+
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "Neniu ricevonto speifiĝas."
+
+#: actions/newmessage.php:164 lib/command.php:484
+msgid ""
+"Don't send a message to yourself; just say it to yourself quietly instead."
+msgstr "Ne sendu mesaĝon al vi mem! Simple suspiru anstataŭ."
+
+#: actions/newmessage.php:181
+msgid "Message sent"
+msgstr "Mesaĝo sendita"
+
+#: actions/newmessage.php:185
+#, php-format
+msgid "Direct message to %s sent."
+msgstr "Rekta mesaĝo al %s sendiĝis."
+
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+msgid "Ajax Error"
+msgstr "Eraro de Ajax"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "Nova avizo"
+
+#: actions/newnotice.php:217
+msgid "Notice posted"
+msgstr "Avizo afiŝiĝas"
+
+#: actions/noticesearch.php:68
+#, php-format
+msgid ""
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
+msgstr ""
+"Serĉi avizon ĉe %%site.name%% per ĝia enhavo. Dividu serĉvortojn per spaco; "
+"ili estu almenaŭ 3 literojn longaj."
+
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "Teksta serĉado"
+
+#: actions/noticesearch.php:91
+#, php-format
+msgid "Search results for \"%1$s\" on %2$s"
+msgstr "Trovito per \"%1$s\" ĉe %2$s"
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+"Estu la unua [afiŝi pri la temo](%%%%action.newnotice%%%%?status_textarea=%"
+"s)!"
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+"Kial ne [krei konton](%%%%action.register%%%%) kaj esti la unua [afiŝi pri "
+"la temo](%%%%action.newnotice%%%%?status_textarea=%s)!"
+
+#: actions/noticesearchrss.php:96
+#, php-format
+msgid "Updates with \"%s\""
+msgstr "Ĝisdatiĝo enhavante \"%s\""
+
+#: actions/noticesearchrss.php:98
+#, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "Ĝisdatiĝo kongruanta al serĉvorto \"%1$s\" ĉe %2$s!"
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+msgstr ""
+"La uzanto ne permesas puŝeton aŭ ne jam konfirmis aŭ registris "
+"retpoŝtadreson."
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "Puŝeto sendiĝis"
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "Puŝeto sendiĝis!"
+
+#: actions/oauthappssettings.php:59
+msgid "You must be logged in to list your applications."
+msgstr "Ensalutu por listigi viajn aplikaĵojn."
+
+#: actions/oauthappssettings.php:74
+msgid "OAuth applications"
+msgstr "OAuth aplikoj"
+
+#: actions/oauthappssettings.php:85
+msgid "Applications you have registered"
+msgstr "Aplikoj kiujn vi enskribis"
+
+#: actions/oauthappssettings.php:135
+#, php-format
+msgid "You have not registered any applications yet."
+msgstr "Vi ne jam registri iun ajn aplikaĵon."
+
+#: actions/oauthconnectionssettings.php:72
+msgid "Connected applications"
+msgstr "Konektita aplikaĵo"
+
+#: actions/oauthconnectionssettings.php:83
+msgid "You have allowed the following applications to access you account."
+msgstr "Vi permesis al jenaj aplikaĵoj aliradon al via konto."
+
+#: actions/oauthconnectionssettings.php:175
+msgid "You are not a user of that application."
+msgstr "Mi ne estas uzanto de tiu aplikaĵo."
+
+#: actions/oauthconnectionssettings.php:186
+#, php-format
+msgid "Unable to revoke access for app: %s."
+msgstr "Maleble revoki aliradon al aplikaĵo: %s."
+
+#: actions/oauthconnectionssettings.php:198
+msgid "You have not authorized any applications to use your account."
+msgstr "Vi ne rajtigis iun ajn aplikaĵon uzi vian konton."
+
+#: actions/oauthconnectionssettings.php:211
+msgid "Developers can edit the registration settings for their applications "
+msgstr "Programisto povas redakti registradan agordon de sia aplikaĵo "
+
+#: actions/oembed.php:80 actions/shownotice.php:100
+msgid "Notice has no profile."
+msgstr "Avizo sen profilo"
+
+#: actions/oembed.php:87 actions/shownotice.php:175
+#, php-format
+msgid "%1$s's status on %2$s"
+msgstr "Stato de %1$s ĉe %2$s"
+
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:159
+#, php-format
+msgid "Content type %s not supported."
+msgstr "Enhavtipo %s ne subteniĝas."
+
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:163
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
+msgstr ""
+
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
+#: lib/apiaction.php:1232 lib/apiaction.php:1355
+msgid "Not a supported data format."
+msgstr "Datumformato ne subteniĝas."
+
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "Homserĉo"
+
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "Avizoserĉo"
+
+#: actions/othersettings.php:60
+msgid "Other settings"
+msgstr "Aliaj agordoj"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "Agordi diversajn aliajn elektojn."
+
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr " (Senpaga servo)"
+
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr "Mallongigu URLojn per"
+
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "Uzota aŭtomata mallongigad-servo."
+
+#: actions/othersettings.php:122
+msgid "View profile designs"
+msgstr "Vidi profilo-desegnon"
+
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr "Montri aŭ kaŝi profilo-desegnon."
+
+#: actions/othersettings.php:153
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL-mallongigado-servo tro longas (maksimume 50 literojn)."
+
+#: actions/otp.php:69
+msgid "No user ID specified."
+msgstr "Neniu uzanto-ID specifiĝas."
+
+#: actions/otp.php:83
+msgid "No login token specified."
+msgstr "Neniu ensalutado-ĵetono specifiĝas."
+
+#: actions/otp.php:90
+msgid "No login token requested."
+msgstr "Neniu ensalutad-ĵetono bezoniĝas."
+
+#: actions/otp.php:95
+msgid "Invalid login token specified."
+msgstr "Specifita ensalutado-ĵetono nevalidas."
+
+#: actions/otp.php:104
+msgid "Login token expired."
+msgstr "Ensalutado-ĵetono eksvalidiĝas."
+
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %1$s - page %2$d"
+msgstr "elirkesto de %1$s - paĝo %2$d"
+
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "Elirkesto de %s"
+
+#: actions/outbox.php:116
+#, fuzzy
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr ""
+"Tio ĉi estas via alvenkesto, kie listiĝas viaj alvenaj privataj mesaĝoj."
+
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "Ŝanĝi pasvorton"
+
+#: actions/passwordsettings.php:69
+msgid "Change your password."
+msgstr "Ŝanĝi vian pasvorton."
+
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+msgid "Password change"
+msgstr "Pasvorta ŝanĝo"
+
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "Malnova pasvorto"
+
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "Nova pasvorto"
+
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 aŭ pli da literoj"
+
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:440
+msgid "Confirm"
+msgstr "Konfirmi"
+
+#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "Same kiel pasvorto supra"
+
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "Ŝanĝi"
+
+#: actions/passwordsettings.php:154 actions/register.php:237
+msgid "Password must be 6 or more characters."
+msgstr "Pasvorto devas esti 6-litera aŭ pli longa."
+
+#: actions/passwordsettings.php:157 actions/register.php:240
+msgid "Passwords don't match."
+msgstr "La pasvortoj diferencas."
+
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "Neĝusta malnova pasvorto"
+
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "Eraris konservi uzanton: nevalida."
+
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+msgid "Can't save new password."
+msgstr "Malsukcesis konservi novan pasvorton."
+
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "Pasvorto konservitas."
+
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+msgid "Paths"
+msgstr "Vojoj"
+
+#: actions/pathsadminpanel.php:70
+msgid "Path and server settings for this StatusNet site."
+msgstr "Vojo kaj servila agordo por ĉi tiu StatusNet-retejo."
+
+#: actions/pathsadminpanel.php:157
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s."
+msgstr "Desegno ne havebla: %s."
+
+#: actions/pathsadminpanel.php:163
+#, fuzzy, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "Avatara adresaro"
+
+#: actions/pathsadminpanel.php:169
+#, fuzzy, php-format
+msgid "Background directory not writable: %s."
+msgstr "Fona adresaro"
+
+#: actions/pathsadminpanel.php:177
+#, php-format
+msgid "Locales directory not readable: %s."
+msgstr ""
+
+#: actions/pathsadminpanel.php:183
+msgid "Invalid SSL server. The maximum length is 255 characters."
+msgstr ""
+
+#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+msgid "Site"
+msgstr "Retejo"
+
+#: actions/pathsadminpanel.php:238
+msgid "Server"
+msgstr "Servilo"
+
+#: actions/pathsadminpanel.php:238
+msgid "Site's server hostname."
+msgstr "Gastigserva Nomo de la retejo"
+
+#: actions/pathsadminpanel.php:242
+msgid "Path"
+msgstr "Vojo"
+
+#: actions/pathsadminpanel.php:242
+msgid "Site path"
+msgstr "Reteja vojo"
+
+#: actions/pathsadminpanel.php:246
+msgid "Path to locales"
+msgstr "Lokigilo al lokaĵaro"
+
+#: actions/pathsadminpanel.php:246
+msgid "Directory path to locales"
+msgstr "Adresara lokigilo al lokaĵaro"
+
+#: actions/pathsadminpanel.php:250
+msgid "Fancy URLs"
+msgstr ""
+
+#: actions/pathsadminpanel.php:252
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
+
+#: actions/pathsadminpanel.php:259
+msgid "Theme"
+msgstr "Temo"
+
+#: actions/pathsadminpanel.php:264
+msgid "Theme server"
+msgstr "Tema servilo"
+
+#: actions/pathsadminpanel.php:268
+msgid "Theme path"
+msgstr "Temo-lokigilo"
+
+#: actions/pathsadminpanel.php:272
+msgid "Theme directory"
+msgstr "Tema adresaro"
+
+#: actions/pathsadminpanel.php:279
+msgid "Avatars"
+msgstr "Avataroj"
+
+#: actions/pathsadminpanel.php:284
+msgid "Avatar server"
+msgstr "Avatara servilo"
+
+#: actions/pathsadminpanel.php:288
+msgid "Avatar path"
+msgstr "Avataro-lokigilo"
+
+#: actions/pathsadminpanel.php:292
+msgid "Avatar directory"
+msgstr "Avatara adresaro"
+
+#: actions/pathsadminpanel.php:301
+msgid "Backgrounds"
+msgstr "Fono"
+
+#: actions/pathsadminpanel.php:305
+msgid "Background server"
+msgstr "Fono-lokigilo"
+
+#: actions/pathsadminpanel.php:309
+msgid "Background path"
+msgstr "Fono-lokigilo"
+
+#: actions/pathsadminpanel.php:313
+msgid "Background directory"
+msgstr "Fona adresaro"
+
+#: actions/pathsadminpanel.php:320
+msgid "SSL"
+msgstr "\"SSL\""
+
+#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+msgid "Never"
+msgstr "Neniam"
+
+#: actions/pathsadminpanel.php:324
+msgid "Sometimes"
+msgstr "Kelkfoje"
+
+#: actions/pathsadminpanel.php:325
+msgid "Always"
+msgstr "Ĉiam"
+
+#: actions/pathsadminpanel.php:329
+msgid "Use SSL"
+msgstr "Uzi \"SSL\""
+
+#: actions/pathsadminpanel.php:330
+msgid "When to use SSL"
+msgstr "Kiam uzi \"SSL\""
+
+#: actions/pathsadminpanel.php:335
+msgid "SSL server"
+msgstr "\"SSL\"a servilo"
+
+#: actions/pathsadminpanel.php:336
+msgid "Server to direct SSL requests to"
+msgstr "Servilo, kien orienti \"SSL\"-peton"
+
+#: actions/pathsadminpanel.php:352
+msgid "Save paths"
+msgstr "Konservu lokigilon"
+
+#: actions/peoplesearch.php:52
+#, php-format
+msgid ""
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"Serĉi personon ĉe %%site.name%% per ĝia nomo, loko, aŭ intereso. Dividu "
+"serĉvortojn per spacoj; ili estu almenaŭ 3 literojn longaj."
+
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "Persona serĉado"
+
+#: actions/peopletag.php:68
+#, php-format
+msgid "Not a valid people tag: %s."
+msgstr "Ne valida persona markilo: %s."
+
+#: actions/peopletag.php:142
+#, php-format
+msgid "Users self-tagged with %1$s - page %2$d"
+msgstr "Uzantoj sinmarkitaj per %1$s - paĝo %2$d"
+
+#: actions/postnotice.php:95
+msgid "Invalid notice content."
+msgstr "Nevalida avizo-enhavo"
+
+#: actions/postnotice.php:101
+#, php-format
+msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
+
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "Profila agordo"
+
+#: actions/profilesettings.php:71
+msgid ""
+"You can update your personal profile info here so people know more about you."
+msgstr ""
+"Vi povas ĝisdatigi vian propran profilan informon, por ke oni sciu pli pri "
+"vi."
+
+#: actions/profilesettings.php:99
+msgid "Profile information"
+msgstr "Profila informo"
+
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
+
+#: actions/profilesettings.php:111 actions/register.php:455
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
+msgid "Full name"
+msgstr "Plena nomo"
+
+#. TRANS: Form input field label.
+#: actions/profilesettings.php:115 actions/register.php:460
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "Hejmpaĝo"
+
+#: actions/profilesettings.php:117 actions/register.php:462
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
+
+#: actions/profilesettings.php:122 actions/register.php:468
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
+
+#: actions/profilesettings.php:125 actions/register.php:471
+msgid "Describe yourself and your interests"
+msgstr "Priskribu vin mem kaj viajn ŝatokupojn"
+
+#: actions/profilesettings.php:127 actions/register.php:473
+msgid "Bio"
+msgstr "Biografio"
+
+#: actions/profilesettings.php:132 actions/register.php:478
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
+#: lib/userprofile.php:165
+msgid "Location"
+msgstr "Loko"
+
+#: actions/profilesettings.php:134 actions/register.php:480
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
+
+#: actions/profilesettings.php:138
+msgid "Share my current location when posting notices"
+msgstr "Sciigu mian nunan lokon, kiam mi sendas avizon."
+
+#: actions/profilesettings.php:145 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
+msgid "Tags"
+msgstr "Markiloj"
+
+#: actions/profilesettings.php:147
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+"Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
+"per komoj aŭ spacoj"
+
+#: actions/profilesettings.php:151
+msgid "Language"
+msgstr "Lingvo"
+
+#: actions/profilesettings.php:152
+msgid "Preferred language"
+msgstr "Preferata lingvo"
+
+#: actions/profilesettings.php:161
+msgid "Timezone"
+msgstr "Horzono"
+
+#: actions/profilesettings.php:162
+msgid "What timezone are you normally in?"
+msgstr "En kiu horzono vi kutime troviĝas?"
+
+#: actions/profilesettings.php:167
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
+
+#: actions/profilesettings.php:228 actions/register.php:230
+#, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "Biografio tro longas (maksimume 255 literoj)"
+
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+msgid "Timezone not selected."
+msgstr "Horzono ne elektita"
+
+#: actions/profilesettings.php:241
+msgid "Language is too long (max 50 chars)."
+msgstr "Lingvo tro longas (maksimume 255 literoj)"
+
+#: actions/profilesettings.php:253 actions/tagother.php:178
+#, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "Nevalida markilo: \"%s\""
+
+#: actions/profilesettings.php:306
+msgid "Couldn't update user for autosubscribe."
+msgstr "Malsukcesis ĝisdatigi uzanton por aŭtomatabonado."
+
+#: actions/profilesettings.php:363
+msgid "Couldn't save location prefs."
+msgstr "Malsukcesis konservi lokan preferon."
+
+#: actions/profilesettings.php:375
+msgid "Couldn't save profile."
+msgstr "Malsukcesis konservi la profilon."
+
+#: actions/profilesettings.php:383
+msgid "Couldn't save tags."
+msgstr "Malsukcesis konservi markilojn."
+
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+msgid "Settings saved."
+msgstr "Agordo konservitas."
+
+#: actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)."
+msgstr "Trans paĝolimo (%s)."
+
+#: actions/public.php:92
+msgid "Could not retrieve public stream."
+msgstr "Malsukcesis ricevi publikan fluon"
+
+#: actions/public.php:130
+#, php-format
+msgid "Public timeline, page %d"
+msgstr "Publika tempstrio, paĝo %d"
+
+#: actions/public.php:132 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "Publika tempstrio"
+
+#: actions/public.php:160
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "Publika fluo (RSS 1.0)"
+
+#: actions/public.php:164
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "Publika fluo (RSS 2.0)"
+
+#: actions/public.php:168
+msgid "Public Stream Feed (Atom)"
+msgstr "Publika fluo (Atom)"
+
+#: actions/public.php:188
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+"Tio ĉi estas la publika tempstrio de %%site.name%%, sed ankoraŭ neniu afiŝis "
+"ion ajn."
+
+#: actions/public.php:191
+msgid "Be the first to post!"
+msgstr "Estu la unua afiŝanto!"
+
+#: actions/public.php:195
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
+
+#: actions/public.php:242
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/public.php:247
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/publictagcloud.php:57
+msgid "Public tag cloud"
+msgstr "Publika markil-nubo"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr "Estu la unua afiŝanto!"
+
+#: actions/publictagcloud.php:75
+#, fuzzy, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
+
+#: actions/publictagcloud.php:134
+#, fuzzy
+msgid "Tag cloud"
+msgstr "Publika markil-nubo"
+
+#: actions/recoverpassword.php:36
+#, fuzzy
+msgid "You are already logged in!"
+msgstr "Vi jam ensalutis."
+
+#: actions/recoverpassword.php:62
+#, fuzzy
+msgid "No such recovery code."
+msgstr "Ne estas tiu avizo."
+
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr ""
+
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr ""
+
+#: actions/recoverpassword.php:86
+#, fuzzy
+msgid "Error with confirmation code."
+msgstr "Neniu konfirma kodo."
+
+#: actions/recoverpassword.php:97
+#, fuzzy
+msgid "This confirmation code is too old. Please start again."
+msgstr "Tiu komfirmnumero ne estas por vi!"
+
+#: actions/recoverpassword.php:111
+#, fuzzy
+msgid "Could not update user with confirmed email address."
+msgstr "Nuna konfirmita retpoŝtadreso."
+
+#: actions/recoverpassword.php:152
+msgid ""
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
+
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr "Vi estis identigita. Enigu sube novan pasvorton."
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recovery"
+msgstr "Pasvorta ŝanĝo"
+
+#: actions/recoverpassword.php:191
+#, fuzzy
+msgid "Nickname or email address"
+msgstr "Neniu retpoŝta adreso."
+
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr ""
+
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#, fuzzy
+msgid "Recover"
+msgstr "Forigi"
+
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "Refari pasvorton"
+
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "Refari pasvorton"
+
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+msgid "Password recovery requested"
+msgstr ""
+
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr ""
+
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "Almenaŭ 6 signoj, kaj ne forgesu ĝin!"
+
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "Restarigi"
+
+#: actions/recoverpassword.php:252
+#, fuzzy
+msgid "Enter a nickname or email address."
+msgstr "Tiu ne estas via retpoŝtadreso."
+
+#: actions/recoverpassword.php:282
+msgid "No user with that email address or username."
+msgstr ""
+
+#: actions/recoverpassword.php:299
+msgid "No registered email address for that user."
+msgstr ""
+
+#: actions/recoverpassword.php:313
+#, fuzzy
+msgid "Error saving address confirmation."
+msgstr "Eraris konservi uzanton: nevalida."
+
+#: actions/recoverpassword.php:338
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr ""
+
+#: actions/recoverpassword.php:357
+#, fuzzy
+msgid "Unexpected password reset."
+msgstr "Neatendita formo-sendo."
+
+#: actions/recoverpassword.php:365
+msgid "Password must be 6 chars or more."
+msgstr "Pasvorto devas enhavi 6 signojn aŭ pli."
+
+#: actions/recoverpassword.php:369
+#, fuzzy
+msgid "Password and confirmation do not match."
+msgstr "La pasvortoj diferencas."
+
+#: actions/recoverpassword.php:388 actions/register.php:255
+#, fuzzy
+msgid "Error setting user."
+msgstr "Eraris konservi uzanton: nevalida."
+
+#: actions/recoverpassword.php:395
+msgid "New password successfully saved. You are now logged in."
+msgstr ""
+
+#: actions/register.php:92 actions/register.php:196 actions/register.php:412
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:99
+msgid "Sorry, invalid invitation code."
+msgstr ""
+
+#: actions/register.php:119
+msgid "Registration successful"
+msgstr "Registriĝo sukcesa"
+
+#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
+msgid "Register"
+msgstr "Registri"
+
+#: actions/register.php:142
+msgid "Registration not allowed."
+msgstr "Registriĝo ne permesita."
+
+#: actions/register.php:205
+msgid "You can't register if you don't agree to the license."
+msgstr "Vi ne povas registri se vi ne konsentas al la licenco."
+
+#: actions/register.php:219
+msgid "Email address already exists."
+msgstr "Retpoŝta adreso jam ekzistas."
+
+#: actions/register.php:250 actions/register.php:272
+msgid "Invalid username or password."
+msgstr "Nevalida uzantnomo aŭ pasvorto."
+
+#: actions/register.php:350
+msgid ""
+"With this form you can create a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/register.php:432
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
+
+#: actions/register.php:437
+#, fuzzy
+msgid "6 or more characters. Required."
+msgstr "6 aŭ pli da literoj"
+
+#: actions/register.php:441
+#, fuzzy
+msgid "Same as password above. Required."
+msgstr "Same kiel pasvorto supra"
+
+#. TRANS: Link description in user account settings menu.
+#: actions/register.php:445 actions/register.php:449
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+msgid "Email"
+msgstr "Retpoŝto"
+
+#: actions/register.php:446 actions/register.php:450
+msgid "Used only for updates, announcements, and password recovery"
+msgstr ""
+
+#: actions/register.php:457
+msgid "Longer name, preferably your \"real\" name"
+msgstr ""
+
+#: actions/register.php:518
+#, php-format
+msgid ""
+"I understand that content and data of %1$s are private and confidential."
+msgstr ""
+
+#: actions/register.php:528
+#, php-format
+msgid "My text and files are copyright by %1$s."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
+#: actions/register.php:532
+msgid "My text and files remain under my own copyright."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
+#: actions/register.php:535
+msgid "All rights reserved."
+msgstr ""
+
+#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
+#: actions/register.php:540
+#, php-format
+msgid ""
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
+msgstr ""
+
+#: actions/register.php:583
+#, php-format
+msgid ""
+"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
+"\n"
+"* Go to [your profile](%2$s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
+msgstr ""
+
+#: actions/register.php:607
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr ""
+
+#: actions/remotesubscribe.php:98
+#, php-format
+msgid ""
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new  account. If you already have an account  on a [compatible "
+"microblogging site](%%doc.openmublog%%),  enter your profile URL below."
+msgstr ""
+
+#: actions/remotesubscribe.php:112
+#, fuzzy
+msgid "Remote subscribe"
+msgstr "Malaboni"
+
+#: actions/remotesubscribe.php:124
+msgid "Subscribe to a remote user"
+msgstr ""
+
+#: actions/remotesubscribe.php:129
+#, fuzzy
+msgid "User nickname"
+msgstr "Neniu kromnomo."
+
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr ""
+
+#: actions/remotesubscribe.php:133
+#, fuzzy
+msgid "Profile URL"
+msgstr "Profilo"
+
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr ""
+
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:406
+msgid "Subscribe"
+msgstr "Aboni"
+
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
+msgstr ""
+
+#: actions/remotesubscribe.php:176
+msgid "That’s a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "Malsukcesis interŝanĝi petĵetonon al atingoĵetono."
+
+#: actions/repeat.php:57
+msgid "Only logged-in users can repeat notices."
+msgstr ""
+
+#: actions/repeat.php:64 actions/repeat.php:71
+#, fuzzy
+msgid "No notice specified."
+msgstr "Neniu profilo elektita."
+
+#: actions/repeat.php:76
+msgid "You can't repeat your own notice."
+msgstr "Vi ne povas ripeti vian propran avizon."
+
+#: actions/repeat.php:90
+msgid "You already repeated that notice."
+msgstr "La avizo jam ripetiĝis."
+
+#: actions/repeat.php:114 lib/noticelist.php:676
+msgid "Repeated"
+msgstr "Ripetita"
+
+#: actions/repeat.php:119
+msgid "Repeated!"
+msgstr "Ripetita!"
+
+#: actions/replies.php:126 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, fuzzy, php-format
+msgid "Replies to %s"
+msgstr "Ripetoj de %s"
+
+#: actions/replies.php:128
+#, fuzzy, php-format
+msgid "Replies to %1$s, page %2$d"
+msgstr "Alvenkesto de %1$s - paĝo %2$d"
+
+#: actions/replies.php:145
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/replies.php:152
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#: actions/replies.php:159
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#: actions/replies.php:199
+#, fuzzy, php-format
+msgid ""
+"This is the timeline showing replies to %1$s but %2$s hasn't received a "
+"notice to them yet."
+msgstr ""
+"Tie ĉi estas la tempstrio de %s kaj amikoj sed ankoraŭ neniu afiŝis ion ajn."
+
+#: actions/replies.php:204
+#, 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
+#, fuzzy, php-format
+msgid ""
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
+msgstr ""
+"Vi povas provi  [puŝeti %1$s](../%2$s) de lia profilo aŭ [afiŝi ion al li](%%"
+"%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "Bonvenon al %1$s, @%2$s!"
+
+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#: actions/revokerole.php:82
+#, fuzzy
+msgid "User doesn't have this role."
+msgstr "Uzanto jam havas la rolon."
+
+#: actions/rsd.php:146 actions/version.php:159
+#, fuzzy
+msgid "StatusNet"
+msgstr "Stato forigita."
+
+#: actions/sandbox.php:65 actions/unsandbox.php:65
+#, fuzzy
+msgid "You cannot sandbox users on this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#: actions/sandbox.php:72
+#, fuzzy
+msgid "User is already sandboxed."
+msgstr "La uzanto jam de grupo blokiĝas."
+
+#. TRANS: Menu item for site administration
+#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
+#: lib/adminpanelaction.php:392
+#, fuzzy
+msgid "Sessions"
+msgstr "Versio"
+
+#: actions/sessionsadminpanel.php:65
+#, fuzzy
+msgid "Session settings for this StatusNet site."
+msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+
+#: actions/sessionsadminpanel.php:175
+msgid "Handle sessions"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:177
+msgid "Whether to handle sessions ourselves."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:181
+msgid "Session debugging"
+msgstr ""
+
+#: actions/sessionsadminpanel.php:183
+msgid "Turn on debugging output for sessions."
+msgstr ""
+
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/useradminpanel.php:294
+#, fuzzy
+msgid "Save site settings"
+msgstr "Konservu atingan agordon"
+
+#: actions/showapplication.php:82
+#, fuzzy
+msgid "You must be logged in to view an application."
+msgstr "Ensalutu por redakti la aplikaĵon."
+
+#: actions/showapplication.php:157
+#, fuzzy
+msgid "Application profile"
+msgstr "Aplikaĵo ne trovita."
+
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182
+msgid "Icon"
+msgstr ""
+
+#. TRANS: Form input field label for application name.
+#: actions/showapplication.php:169 actions/version.php:197
+#: lib/applicationeditform.php:199
+msgid "Name"
+msgstr "Nomo"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235
+msgid "Organization"
+msgstr "Organizaĵo"
+
+#. TRANS: Form input field label.
+#: actions/showapplication.php:187 actions/version.php:200
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+msgid "Description"
+msgstr "Priskribo"
+
+#: actions/showapplication.php:192 actions/showgroup.php:436
+#: lib/profileaction.php:187
+msgid "Statistics"
+msgstr ""
+
+#: actions/showapplication.php:203
+#, php-format
+msgid "Created by %1$s - %2$s access by default - %3$d users"
+msgstr ""
+
+#: actions/showapplication.php:213
+#, fuzzy
+msgid "Application actions"
+msgstr "Aplikaĵo ne trovita."
+
+#: actions/showapplication.php:236
+msgid "Reset key & secret"
+msgstr ""
+
+#: actions/showapplication.php:261
+#, fuzzy
+msgid "Application info"
+msgstr "Aplikaĵo ne trovita."
+
+#: actions/showapplication.php:263
+msgid "Consumer key"
+msgstr ""
+
+#: actions/showapplication.php:268
+msgid "Consumer secret"
+msgstr ""
+
+#: actions/showapplication.php:273
+msgid "Request token URL"
+msgstr ""
+
+#: actions/showapplication.php:278
+msgid "Access token URL"
+msgstr ""
+
+#: actions/showapplication.php:283
+msgid "Authorize URL"
+msgstr ""
+
+#: actions/showapplication.php:288
+msgid ""
+"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
+"signature method."
+msgstr ""
+
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "Ĉu vi certe volas forigi la avizon?"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%1$s's favorite notices, page %2$d"
+msgstr "Ŝatataj avizoj de %s"
+
+#: actions/showfavorites.php:132
+#, fuzzy
+msgid "Could not retrieve favorite notices."
+msgstr "Malsukcesis krei ŝataton."
+
+#: actions/showfavorites.php:171
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/showfavorites.php:178
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#: actions/showfavorites.php:185
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#: actions/showfavorites.php:206
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+
+#: actions/showfavorites.php:208
+#, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:212
+#, fuzzy, php-format
+msgid ""
+"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
+"action.register%%%%) and then post something interesting they would add to "
+"their favorites :)"
+msgstr ""
+"[Kreu konton](%%action.register%%) kaj estu la unua, kiu aldonos avizon al "
+"sia ŝatolisto!"
+
+#: actions/showfavorites.php:243
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:82 lib/groupnav.php:86
+#, fuzzy, php-format
+msgid "%s group"
+msgstr "Grupoj de %s"
+
+#: actions/showgroup.php:84
+#, fuzzy, php-format
+msgid "%1$s group, page %2$d"
+msgstr "%1$s grupanoj, paĝo %2$d"
+
+#: actions/showgroup.php:227
+#, fuzzy
+msgid "Group profile"
+msgstr "Grupa emblemo"
+
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
+msgid "URL"
+msgstr "URL"
+
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
+msgid "Note"
+msgstr "Noto"
+
+#: actions/showgroup.php:293 lib/groupeditform.php:184
+#, fuzzy
+msgid "Aliases"
+msgstr "Ĉiam"
+
+#: actions/showgroup.php:302
+#, fuzzy
+msgid "Group actions"
+msgstr "grupoj ĉe %s"
+
+#: actions/showgroup.php:338
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/showgroup.php:344
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#: actions/showgroup.php:350
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#: actions/showgroup.php:355
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "Grupoj de %s"
+
+#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+msgid "Members"
+msgstr "Grupanoj"
+
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
+#, fuzzy
+msgid "(None)"
+msgstr "Noto"
+
+#: actions/showgroup.php:404
+msgid "All members"
+msgstr "Ĉiuj grupanoj"
+
+#: actions/showgroup.php:439
+#, fuzzy
+msgid "Created"
+msgstr "Ripetita"
+
+#: actions/showgroup.php:455
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/showgroup.php:461
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/showgroup.php:489
+#, fuzzy
+msgid "Admins"
+msgstr "Administranto"
+
+#: actions/showmessage.php:81
+#, fuzzy
+msgid "No such message."
+msgstr "Ne estas tiu paĝo."
+
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr ""
+
+#: actions/showmessage.php:108
+#, fuzzy, php-format
+msgid "Message to %1$s on %2$s"
+msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
+
+#: actions/showmessage.php:113
+#, fuzzy, php-format
+msgid "Message from %1$s on %2$s"
+msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
+
+#: actions/shownotice.php:90
+msgid "Notice deleted."
+msgstr "Avizo viŝiĝas"
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "Avizoj etikeditaj %s"
+
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%1$s, page %2$d"
+msgstr "%1$s kaj amikoj, paĝo %2$d"
+
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "Elirkesto de %s"
+
+#: actions/showstream.php:200
+#, fuzzy, php-format
+msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgstr ""
+"Tie ĉi estas la tempstrio de %s kaj amikoj sed ankoraŭ neniu afiŝis ion ajn."
+
+#: actions/showstream.php:205
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:207
+#, fuzzy, php-format
+msgid ""
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
+msgstr ""
+"Vi povas provi  [puŝeti %1$s](../%2$s) de lia profilo aŭ [afiŝi ion al li](%%"
+"%%action.newnotice%%%%?status_textarea=%3$s)."
+
+#: actions/showstream.php:243
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/showstream.php:248
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
+"net/)."
+
+#: actions/showstream.php:305
+#, fuzzy, php-format
+msgid "Repeat of %s"
+msgstr "Ripetoj de %s"
+
+#: actions/silence.php:65 actions/unsilence.php:65
+#, fuzzy
+msgid "You cannot silence users on this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#: actions/silence.php:72
+#, fuzzy
+msgid "User is already silenced."
+msgstr "La uzanto jam de grupo blokiĝas."
+
+#: actions/siteadminpanel.php:69
+#, fuzzy
+msgid "Basic settings for this StatusNet site"
+msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+
+#: actions/siteadminpanel.php:133
+msgid "Site name must have non-zero length."
+msgstr ""
+
+#: actions/siteadminpanel.php:141
+#, fuzzy
+msgid "You must have a valid contact email address."
+msgstr "Retpoŝta adreso ne valida"
+
+#: actions/siteadminpanel.php:159
+#, php-format
+msgid "Unknown language \"%s\"."
+msgstr ""
+
+#: actions/siteadminpanel.php:165
+msgid "Minimum text limit is 0 (unlimited)."
+msgstr ""
+
+#: actions/siteadminpanel.php:171
+msgid "Dupe limit must be one or more seconds."
+msgstr ""
+
+#: actions/siteadminpanel.php:221
+msgid "General"
+msgstr "Ĝenerala"
+
+#: actions/siteadminpanel.php:224
+#, fuzzy
+msgid "Site name"
+msgstr "Reteja desegno"
+
+#: actions/siteadminpanel.php:225
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
+
+#: actions/siteadminpanel.php:229
+msgid "Brought by"
+msgstr ""
+
+#: actions/siteadminpanel.php:230
+msgid "Text used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:234
+msgid "Brought by URL"
+msgstr ""
+
+#: actions/siteadminpanel.php:235
+msgid "URL used for credits link in footer of each page"
+msgstr ""
+
+#: actions/siteadminpanel.php:239
+#, fuzzy
+msgid "Contact email address for your site"
+msgstr "Alvena retpoŝtadreso forigita."
+
+#: actions/siteadminpanel.php:245
+#, fuzzy
+msgid "Local"
+msgstr "Loko"
+
+#: actions/siteadminpanel.php:256
+msgid "Default timezone"
+msgstr ""
+
+#: actions/siteadminpanel.php:257
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
+
+#: actions/siteadminpanel.php:262
+#, fuzzy
+msgid "Default language"
+msgstr "Preferata lingvo"
+
+#: actions/siteadminpanel.php:263
+msgid "Site language when autodetection from browser settings is not available"
+msgstr ""
+
+#: actions/siteadminpanel.php:271
+msgid "Limits"
+msgstr ""
+
+#: actions/siteadminpanel.php:274
+msgid "Text limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:274
+msgid "Maximum number of characters for notices."
+msgstr ""
+
+#: actions/siteadminpanel.php:278
+msgid "Dupe limit"
+msgstr ""
+
+#: actions/siteadminpanel.php:278
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:56
+#, fuzzy
+msgid "Site Notice"
+msgstr "Avizoj"
+
+#: actions/sitenoticeadminpanel.php:67
+#, fuzzy
+msgid "Edit site-wide message"
+msgstr "Nova mesaĝo"
+
+#: actions/sitenoticeadminpanel.php:103
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "Malsukcesis konservi vian desegnan agordon"
+
+#: actions/sitenoticeadminpanel.php:113
+msgid "Max length for the site-wide notice is 255 chars."
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:176
+#, fuzzy
+msgid "Site notice text"
+msgstr "Forigi avizon"
+
+#: actions/sitenoticeadminpanel.php:178
+msgid "Site-wide notice text (255 chars max; HTML okay)"
+msgstr ""
+
+#: actions/sitenoticeadminpanel.php:198
+#, fuzzy
+msgid "Save site notice"
+msgstr "Forigi avizon"
+
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
+#, fuzzy
+msgid "SMS settings"
+msgstr "Tujmesaĝila agordo."
+
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
+#, fuzzy, php-format
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "Administri kiel ricevi mesaĝon de  %%site.name%%."
+
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
+#, fuzzy
+msgid "SMS is not available."
+msgstr "Tujmesaĝilo ne estas disponebla."
+
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Tujmesaĝila adreso"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
+#, fuzzy
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "Nuna konfirmita retpoŝtadreso."
+
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
+msgid "Awaiting confirmation on this phone number."
+msgstr ""
+
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
+#, fuzzy
+msgid "Confirmation code"
+msgstr "Neniu konfirma kodo."
+
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
+msgid "Enter the code you received on your phone."
+msgstr ""
+
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Konfirmi"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
+msgid "SMS phone number"
+msgstr ""
+
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "1-64 minusklaj literoj aŭ ciferoj, neniu interpunkcio aŭ spaco"
+
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Tujmesaĝilaj preferoj"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
+msgid ""
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr ""
+
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Prefero konservita."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
+#, fuzzy
+msgid "No phone number."
+msgstr "Ne ekzistas tiu uzanto."
+
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
+#, fuzzy
+msgid "No carrier selected."
+msgstr "Avizo viŝiĝas"
+
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
+#, fuzzy
+msgid "That is already your phone number."
+msgstr "Tio estas jam via Jabber-ID."
+
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
+#, fuzzy
+msgid "That phone number already belongs to another user."
+msgstr "Tiu retpoŝtadreso jam apartenas al alia uzanto."
+
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"Konfirmkodo jam senditas al la aldonita retpoŝtadreso. Kontrolu vian "
+"alvenkeston (kaj spamkeston!) pri la kodo kaj instrukcio pri kiel uzi ĝin."
+
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
+#, fuzzy
+msgid "That is the wrong confirmation number."
+msgstr "Tiu retpoŝtadreso estas malĝusta."
+
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Tujmesaĝila konfirmo nuligita."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
+#, fuzzy
+msgid "That is not your phone number."
+msgstr "Tio ne estas via Jabber-ID."
+
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "La tujmesaĝila adreso estas forigita."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
+msgid "Mobile carrier"
+msgstr ""
+
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
+msgid "Select a carrier"
+msgstr ""
+
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
+#, php-format
+msgid ""
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
+#, fuzzy
+msgid "No code entered"
+msgstr "Neniu enhavo!"
+
+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:408
+msgid "Snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:65
+#, fuzzy
+msgid "Manage snapshot configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#: actions/snapshotadminpanel.php:127
+#, fuzzy
+msgid "Invalid snapshot run value."
+msgstr "Rolo nevalida."
+
+#: actions/snapshotadminpanel.php:133
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:144
+#, fuzzy
+msgid "Invalid snapshot report URL."
+msgstr "URL por la emblemo nevalida."
+
+#: actions/snapshotadminpanel.php:200
+msgid "Randomly during web hit"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:201
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:208
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:217
+msgid "Frequency"
+msgstr "Ofteco"
+
+#: actions/snapshotadminpanel.php:218
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:226
+msgid "Report URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:227
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "Konservu atingan agordon"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "Vi ne estas grupano."
+
+#. TRANS: Exception thrown when a subscription could not be stored on the server.
+#: actions/subedit.php:83 classes/Subscription.php:136
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "Malsukcesis konservi la profilon."
+
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
+#, fuzzy
+msgid "No such profile."
+msgstr "Ne ekzistas tia dosiero."
+
+#: actions/subscribe.php:117
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr ""
+
+#: actions/subscribe.php:145
+msgid "Subscribed"
+msgstr "Abonita"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "Malaboni"
+
+#: actions/subscribers.php:52
+#, fuzzy, php-format
+msgid "%1$s subscribers, page %2$d"
+msgstr "%1$s grupanoj, paĝo %2$d"
+
+#: actions/subscribers.php:63
+msgid "These are the people who listen to your notices."
+msgstr ""
+
+#: actions/subscribers.php:67
+#, php-format
+msgid "These are the people who listen to %s's notices."
+msgstr ""
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, fuzzy, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afiŝanto!"
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "Priskribo"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%1$s subscriptions, page %2$d"
+msgstr "%1$s kaj amikoj, paĝo %2$d"
+
+#: actions/subscriptions.php:65
+msgid "These are the people whose notices you listen to."
+msgstr ""
+
+#: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr ""
+
+#: actions/subscriptions.php:126
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#, php-format
+msgid "%s is not listening to anyone."
+msgstr ""
+
+#: actions/subscriptions.php:208
+msgid "Jabber"
+msgstr "Jabber"
+
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS"
+
+#: actions/tag.php:69
+#, fuzzy, php-format
+msgid "Notices tagged with %1$s, page %2$d"
+msgstr "Uzantoj sinmarkitaj per %1$s - paĝo %2$d"
+
+#: actions/tag.php:87
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "Fluo por amikoj de %s (RSS 1.0)"
+
+#: actions/tag.php:93
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Fluo por amikoj de %s (RSS 2.0)"
+
+#: actions/tag.php:99
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "Fluo por amikoj de %s (Atom)"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No ID argument."
+msgstr "Ne estas aldonaĵo."
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "Markiloj"
+
+#: actions/tagother.php:77 lib/userprofile.php:76
+#, fuzzy
+msgid "User profile"
+msgstr "La uzanto ne havas profilon."
+
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:103
+msgid "Photo"
+msgstr "Foto"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "Markiloj"
+
+#: actions/tagother.php:151
+#, fuzzy
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+"Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
+"per komoj aŭ spacoj"
+
+#: actions/tagother.php:193
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:200
+#, fuzzy
+msgid "Could not save tags."
+msgstr "Malsukcesis konservi markilojn."
+
+#: actions/tagother.php:236
+#, fuzzy
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr "Uzu ĉi tiun formularon por redakti vian aplikaĵon."
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "Ne estas tiu paĝo."
+
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "Vi jam blokis la uzanton."
+
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "La uzanto ne estas blokita de grupo."
+
+#: actions/unsilence.php:72
+#, fuzzy
+msgid "User is not silenced."
+msgstr "La uzanto ne havas profilon."
+
+#: actions/unsubscribe.php:77
+#, fuzzy
+msgid "No profile ID in request."
+msgstr "Neniu ensalutad-ĵetono bezoniĝas."
+
+#: actions/unsubscribe.php:98
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Malaboni"
+
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
+#, fuzzy, php-format
+msgid ""
+"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
+msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
+
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+msgctxt "TITLE"
+msgid "User"
+msgstr "Uzanto"
+
+#: actions/useradminpanel.php:70
+#, fuzzy
+msgid "User settings for this StatusNet site."
+msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+
+#: actions/useradminpanel.php:149
+msgid "Invalid bio limit. Must be numeric."
+msgstr ""
+
+#: actions/useradminpanel.php:155
+msgid "Invalid welcome text. Max length is 255 characters."
+msgstr ""
+
+#: actions/useradminpanel.php:165
+#, php-format
+msgid "Invalid default subscripton: '%1$s' is not user."
+msgstr ""
+
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "Profilo"
+
+#: actions/useradminpanel.php:222
+msgid "Bio Limit"
+msgstr ""
+
+#: actions/useradminpanel.php:223
+msgid "Maximum length of a profile bio in characters."
+msgstr ""
+
+#: actions/useradminpanel.php:231
+#, fuzzy
+msgid "New users"
+msgstr "Inviti novajn uzantojn"
+
+#: actions/useradminpanel.php:235
+msgid "New user welcome"
+msgstr ""
+
+#: actions/useradminpanel.php:236
+#, fuzzy
+msgid "Welcome text for new users (Max 255 chars)."
+msgstr "La nomo estas tro longa (maksimume 255 literoj)"
+
+#: actions/useradminpanel.php:241
+#, fuzzy
+msgid "Default subscription"
+msgstr "Priskribo"
+
+#: actions/useradminpanel.php:242
+#, fuzzy
+msgid "Automatically subscribe new users to this user."
+msgstr "Aŭtomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
+
+#: actions/useradminpanel.php:251
+#, fuzzy
+msgid "Invitations"
+msgstr "Invito(j) senditas"
+
+#: actions/useradminpanel.php:256
+#, fuzzy
+msgid "Invitations enabled"
+msgstr "Invito(j) senditas"
+
+#: actions/useradminpanel.php:258
+msgid "Whether to allow users to invite new users."
+msgstr ""
+
+#: actions/userauthorization.php:105
+#, fuzzy
+msgid "Authorize subscription"
+msgstr "Priskribo"
+
+#: actions/userauthorization.php:110
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+
+#: actions/userauthorization.php:196 actions/version.php:167
+msgid "License"
+msgstr "Licenco"
+
+#: actions/userauthorization.php:217
+msgid "Accept"
+msgstr "Akcepti"
+
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "Forigi la uzanton"
+
+#: actions/userauthorization.php:219
+msgid "Reject"
+msgstr "Malakcepti"
+
+#: actions/userauthorization.php:220
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "Forigi la uzanton"
+
+#: actions/userauthorization.php:232
+#, fuzzy
+msgid "No authorization request!"
+msgstr "Neniu ensalutad-ĵetono bezoniĝas."
+
+#: actions/userauthorization.php:254
+#, fuzzy
+msgid "Subscription authorized"
+msgstr "Vi ne estas rajtigita."
+
+#: actions/userauthorization.php:256
+msgid ""
+"The subscription has been authorized, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to authorize the "
+"subscription. Your subscription token is:"
+msgstr ""
+
+#: actions/userauthorization.php:266
+#, fuzzy
+msgid "Subscription rejected"
+msgstr "Priskribo necesas."
+
+#: actions/userauthorization.php:268
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr ""
+
+#: actions/userauthorization.php:303
+#, php-format
+msgid "Listener URI ‘%s’ not found here."
+msgstr ""
+
+#: actions/userauthorization.php:308
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:314
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:329
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:345
+#, fuzzy, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr "Revokfunkcia URL estas nevalida."
+
+#: actions/userauthorization.php:350
+#, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:355
+#, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr ""
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "Vidi profilo-desegnon"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+#, fuzzy
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr "Agordi kiel aspektu via grupo, kun elekto de fonbildo kaj koloraro."
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
+#, fuzzy, php-format
+msgid "%1$s groups, page %2$d"
+msgstr "%1$s grupanoj, paĝo %2$d"
+
+#: actions/usergroups.php:132
+msgid "Search for more groups"
+msgstr ""
+
+#: actions/usergroups.php:159
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "La uzanto ne estas grupano."
+
+#: actions/usergroups.php:164
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom user notice feed.
+#. TRANS: %1$s is a user name, %2$s is a site name.
+#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
+#: lib/atomusernoticefeed.php:76
+#, fuzzy, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "Ŝatataj Ĝisdatiĝoj de %1$s ĉe %2$s!"
+
+#: actions/version.php:75
+#, php-format
+msgid "StatusNet %s"
+msgstr ""
+
+#: actions/version.php:155
+#, php-format
+msgid ""
+"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"Inc. and contributors."
+msgstr ""
+
+#: actions/version.php:163
+msgid "Contributors"
+msgstr "Kontribuantoj"
+
+#: actions/version.php:170
+msgid ""
+"StatusNet 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. "
+msgstr ""
+
+#: actions/version.php:176
+msgid ""
+"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. "
+msgstr ""
+
+#: actions/version.php:182
+#, php-format
+msgid ""
+"You should have received a copy of the GNU Affero General Public License "
+"along with this program.  If not, see %s."
+msgstr ""
+
+#: actions/version.php:191
+msgid "Plugins"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:198 lib/action.php:789
+msgid "Version"
+msgstr "Versio"
+
+#: actions/version.php:199
+msgid "Author(s)"
+msgstr "Aŭtoro(j)"
+
+#. TRANS: Server exception thrown when a URL cannot be processed.
+#: classes/File.php:143
+#, php-format
+msgid "Cannot process URL '%s'"
+msgstr ""
+
+#. TRANS: Server exception thrown when... Robin thinks something is impossible!
+#: classes/File.php:175
+msgid "Robin thinks something is impossible."
+msgstr ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
+#: classes/File.php:190
+#, php-format
+msgid ""
+"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
+"Try to upload a smaller version."
+msgstr ""
+
+#. TRANS: Message given if an upload would exceed user quota.
+#. TRANS: %d (number) is the user quota in bytes.
+#: classes/File.php:202
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#. TRANS: Message given id an upload would exceed a user's monthly quota.
+#. TRANS: $d (number) is the monthly user quota in bytes.
+#: classes/File.php:211
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#. TRANS: Client exception thrown if a file upload does not have a valid name.
+#: classes/File.php:248 classes/File.php:263
+#, fuzzy
+msgid "Invalid filename."
+msgstr "Grando nevalida."
+
+#. TRANS: Exception thrown when joining a group fails.
+#: classes/Group_member.php:42
+#, fuzzy
+msgid "Group join failed."
+msgstr "Grupo ne troviĝas."
+
+#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
+#: classes/Group_member.php:55
+#, fuzzy
+msgid "Not part of group."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Exception thrown when trying to leave a group fails.
+#: classes/Group_member.php:63
+#, fuzzy
+msgid "Group leave failed."
+msgstr "Malsukcesis alŝuti"
+
+#. TRANS: Server exception thrown when updating a local group fails.
+#: classes/Local_group.php:42
+#, fuzzy
+msgid "Could not update local group."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Exception thrown when trying creating a login token failed.
+#. TRANS: %s is the user nickname for which token creation failed.
+#: classes/Login_token.php:78
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "Malsukcesis krei alinomon."
+
+#. TRANS: Exception thrown when database name or Data Source Name could not be found.
+#: classes/Memcached_DataObject.php:533
+msgid "No database name or DSN found anywhere."
+msgstr ""
+
+#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
+#: classes/Message.php:46
+msgid "You are banned from sending direct messages."
+msgstr ""
+
+#. TRANS: Message given when a message could not be stored on the server.
+#: classes/Message.php:63
+#, fuzzy
+msgid "Could not insert message."
+msgstr "Malsukcesis trovi celan uzanton."
+
+#. TRANS: Message given when a message could not be updated on the server.
+#: classes/Message.php:74
+#, fuzzy
+msgid "Could not update message with new URI."
+msgstr "Malsukcesis ĝisdatigi uzanton"
+
+#. 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
+#, php-format
+msgid "No such profile (%1$d) for notice (%2$d)."
+msgstr ""
+
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:190
+#, fuzzy, php-format
+msgid "Database error inserting hashtag: %s"
+msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
+
+#. TRANS: Client exception thrown if a notice contains too many characters.
+#: classes/Notice.php:260
+msgid "Problem saving notice. Too long."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
+#: classes/Notice.php:265
+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:271
+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:278
+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:286
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#. TRANS: Server exception thrown when a notice cannot be saved.
+#. TRANS: Server exception thrown when a notice cannot be updated.
+#: classes/Notice.php:353 classes/Notice.php:380
+msgid "Problem saving notice."
+msgstr ""
+
+#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
+#: classes/Notice.php:892
+msgid "Bad type provided to saveKnownGroups"
+msgstr ""
+
+#. TRANS: Server exception thrown when an update for a group inbox fails.
+#: classes/Notice.php:991
+msgid "Problem saving group inbox."
+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:1746
+#, php-format
+msgid "RT @%1$s %2$s"
+msgstr "RT @%1$s %2$s"
+
+#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:737
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
+msgstr ""
+
+#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
+#. TRANS: %1$s is the role name, %2$s is the user ID (number).
+#: classes/Profile.php:746
+#, php-format
+msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
+msgstr ""
+
+#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
+#: classes/Remote_profile.php:54
+#, fuzzy
+msgid "Missing profile."
+msgstr "La uzanto ne havas profilon."
+
+#. TRANS: Exception thrown when a tag cannot be saved.
+#: classes/Status_network.php:346
+#, fuzzy
+msgid "Unable to save tag."
+msgstr "Malsukcesis konservi vian desegnan agordon"
+
+#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
+#: classes/Subscription.php:75 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "Tiu uzanto abonblokis vin."
+
+#. TRANS: Exception thrown when trying to subscribe while already subscribed.
+#: classes/Subscription.php:80
+#, fuzzy
+msgid "Already subscribed!"
+msgstr "Abonita"
+
+#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
+#: classes/Subscription.php:85
+#, fuzzy
+msgid "User has blocked you."
+msgstr "La uzanto ne estas blokita de grupo."
+
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Abonita"
+
+#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
+#: classes/Subscription.php:178
+#, fuzzy
+msgid "Could not delete self-subscription."
+msgstr "Malsukcesis forigi ŝataton."
+
+#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
+#: classes/Subscription.php:206
+#, fuzzy
+msgid "Could not delete subscription OMB token."
+msgstr "Malsukcesis forigi ŝataton."
+
+#. TRANS: Exception thrown when a subscription could not be deleted on the server.
+#: classes/Subscription.php:218
+#, fuzzy
+msgid "Could not delete subscription."
+msgstr "Malsukcesis forigi ŝataton."
+
+#. TRANS: Notice given on user registration.
+#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
+#: classes/User.php:365
+#, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "Bonvenon al %1$s, @%2$s!"
+
+#. TRANS: Server exception thrown when creating a group failed.
+#: classes/User_group.php:496
+#, fuzzy
+msgid "Could not create group."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Server exception thrown when updating a group URI failed.
+#: classes/User_group.php:506
+#, fuzzy
+msgid "Could not set group URI."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Server exception thrown when setting group membership failed.
+#: classes/User_group.php:529
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "Malsukcesis ĝisdatigi grupon."
+
+#. TRANS: Server exception thrown when saving local group information failed.
+#: classes/User_group.php:544
+#, fuzzy
+msgid "Could not save local group info."
+msgstr "Malsukcesis konservi la profilon."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109
+#, fuzzy
+msgid "Change your profile settings"
+msgstr "Profila agordo"
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "Eraris ĝisdatigi vizaĝbildon."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123
+#, fuzzy
+msgid "Change your password"
+msgstr "Ŝanĝi vian pasvorton."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130
+msgid "Change email handling"
+msgstr ""
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137
+#, fuzzy
+msgid "Design your profile"
+msgstr "La uzanto ne havas profilon."
+
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
+#, fuzzy
+msgid "Other options"
+msgstr "Aliaj agordoj"
+
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"
+msgstr "Alia"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:145
+#, php-format
+msgid "%1$s - %2$s"
+msgstr "%1$s - %2$s"
+
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:161
+msgid "Untitled page"
+msgstr ""
+
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:436
+#, fuzzy
+msgid "Primary site navigation"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:442
+msgctxt "TOOLTIP"
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:445
+msgctxt "MENU"
+msgid "Personal"
+msgstr "Persona"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:447
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Change your email, avatar, password, profile"
+msgstr "Ŝanĝi vian pasvorton."
+
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:452
+msgctxt "TOOLTIP"
+msgid "Connect to services"
+msgstr "Konekti al servoj"
+
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#: lib/action.php:455
+msgid "Connect"
+msgstr "Konekti"
+
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:458
+msgctxt "TOOLTIP"
+msgid "Change site configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#: lib/action.php:461
+msgctxt "MENU"
+msgid "Admin"
+msgstr "Administranto"
+
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:465
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Inviti amikojn kaj kolegojn aliĝi vin sur %s"
+
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:468
+msgctxt "MENU"
+msgid "Invite"
+msgstr "Inviti"
+
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:474
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Logout from the site"
+msgstr "Desegno por la retejo"
+
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:477
+msgctxt "MENU"
+msgid "Logout"
+msgstr " Elsaluti"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:482
+msgctxt "TOOLTIP"
+msgid "Create an account"
+msgstr "Krei konton"
+
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:485
+msgctxt "MENU"
+msgid "Register"
+msgstr "Registriĝi"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:488
+#, fuzzy
+msgctxt "TOOLTIP"
+msgid "Login to the site"
+msgstr "Ensaluti al la retejo"
+
+#: lib/action.php:491
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "Ensaluti"
+
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:494
+msgctxt "TOOLTIP"
+msgid "Help me!"
+msgstr "Helpu min!"
+
+#: lib/action.php:497
+msgctxt "MENU"
+msgid "Help"
+msgstr "Helpo"
+
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:500
+msgctxt "TOOLTIP"
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:503
+#, fuzzy
+msgctxt "MENU"
+msgid "Search"
+msgstr "Homserĉo"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:525 lib/adminpanelaction.php:400
+#, fuzzy
+msgid "Site notice"
+msgstr "Nova avizo"
+
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:592
+msgid "Local views"
+msgstr ""
+
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:659
+#, fuzzy
+msgid "Page notice"
+msgstr "Nova avizo"
+
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:762
+msgid "Secondary site navigation"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:768
+msgid "Help"
+msgstr "Helpo"
+
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:771
+msgid "About"
+msgstr "Enkonduko"
+
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:774
+msgid "FAQ"
+msgstr "Oftaj demandoj"
+
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:779
+msgid "TOS"
+msgstr ""
+
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:783
+msgid "Privacy"
+msgstr "Privateco"
+
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:786
+msgid "Source"
+msgstr "Fontkodo"
+
+#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+#: lib/action.php:792
+msgid "Contact"
+msgstr "Kontakto"
+
+#: lib/action.php:794
+msgid "Badge"
+msgstr "Insigno"
+
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:823
+msgid "StatusNet software license"
+msgstr "Licenco de la programaro StatusNet"
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:827
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%)."
+msgstr ""
+
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:830
+#, php-format
+msgid "**%%site.name%%** is a microblogging service."
+msgstr ""
+
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:834
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:850
+#, fuzzy
+msgid "Site content license"
+msgstr "Licenco de la programaro StatusNet"
+
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:857
+#, 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:864
+#, 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:868
+msgid "Content and data copyright by contributors. All rights reserved."
+msgstr ""
+
+#. TRANS: license message in footer. %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:881
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
+
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1192
+#, fuzzy
+msgid "Pagination"
+msgstr "Registrado"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1203
+msgid "After"
+msgstr "Poste"
+
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1213
+msgid "Before"
+msgstr "Antaŭe"
+
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:122
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activityutils.php:244
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activityutils.php:248
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
+#: lib/adminpanelaction.php:98
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
+#: lib/adminpanelaction.php:110
+#, fuzzy
+msgid "Changes to that panel are not allowed."
+msgstr "Registriĝo ne permesita."
+
+#. TRANS: Client error message.
+#: lib/adminpanelaction.php:229
+msgid "showForm() not implemented."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:259
+msgid "saveSettings() not implemented."
+msgstr ""
+
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:284
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "Malsukcesis konservi vian desegnan agordon"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:350
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:352
+#, fuzzy
+msgctxt "MENU"
+msgid "Site"
+msgstr "Retejo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:358
+#, fuzzy
+msgid "Design configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:360
+#, fuzzy
+msgctxt "MENU"
+msgid "Design"
+msgstr "Aspekto"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:366
+#, fuzzy
+msgid "User configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "Uzanto"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:374
+#, fuzzy
+msgid "Access configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:382
+#, fuzzy
+msgid "Paths configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:390
+#, fuzzy
+msgid "Sessions configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:398
+#, fuzzy
+msgid "Edit site notice"
+msgstr "Forigi avizon"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:406
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "Ŝanĝi agordojn de la retejo"
+
+#. TRANS: Client error 401.
+#: lib/apiauth.php:113
+msgid "API resource requires read-write access, but you only have read access."
+msgstr ""
+
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:137
+#, fuzzy
+msgid "Edit application"
+msgstr "Redakti Aplikon"
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:187
+#, fuzzy
+msgid "Icon for this application"
+msgstr "Ne forigu ĉi tiun aplikaĵon."
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:209
+#, fuzzy, php-format
+msgid "Describe your application in %d characters"
+msgstr "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:213
+#, fuzzy
+msgid "Describe your application"
+msgstr "Forigi aplikaĵon"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224
+#, fuzzy
+msgid "URL of the homepage of this application"
+msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
+
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:226
+#, fuzzy
+msgid "Source URL"
+msgstr "Fontkodo"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233
+#, fuzzy
+msgid "Organization responsible for this application"
+msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242
+msgid "URL for the homepage of the organization"
+msgstr ""
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251
+msgid "URL to redirect to after authentication"
+msgstr ""
+
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278
+msgid "Browser"
+msgstr ""
+
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295
+msgid "Desktop"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297
+msgid "Type of application, browser or desktop"
+msgstr ""
+
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320
+msgid "Read-only"
+msgstr ""
+
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339
+msgid "Read-write"
+msgstr ""
+
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341
+msgid "Default access for this application: read-only, or read-write"
+msgstr ""
+
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
+#, fuzzy
+msgid "Cancel"
+msgstr "Nuligi"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+msgid "read-write"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+msgid "read-only"
+msgstr ""
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr ""
+
+#. TRANS: Button label
+#: lib/applicationlist.php:159
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Revoke"
+msgstr "Forigi"
+
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
+#, fuzzy
+msgid "Attachments"
+msgstr "Ne estas aldonaĵo."
+
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:265
+#, fuzzy
+msgid "Author"
+msgstr "Aŭtoro(j)"
+
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279
+#, fuzzy
+msgid "Provider"
+msgstr "Antaŭrigardo"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+#, fuzzy
+msgid "Tags for this attachment"
+msgstr "Ne estas tiu aldonaĵo."
+
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
+#, fuzzy
+msgid "Password changing failed"
+msgstr "Pasvorta ŝanĝo"
+
+#: lib/authenticationplugin.php:236
+#, fuzzy
+msgid "Password changing is not allowed"
+msgstr "Pasvorta ŝanĝo"
+
+#: lib/channel.php:157 lib/channel.php:177
+#, fuzzy
+msgid "Command results"
+msgstr "Neniu rezulto."
+
+#: lib/channel.php:229 lib/mailhandler.php:142
+msgid "Command complete"
+msgstr ""
+
+#: lib/channel.php:240
+#, fuzzy
+msgid "Command failed"
+msgstr "Malsukcesis alŝuti"
+
+#: lib/command.php:83 lib/command.php:105
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:99 lib/command.php:596
+#, fuzzy
+msgid "User has no last notice"
+msgstr "La uzanto ne havas profilon."
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "Malsukcesis trovi celan uzanton."
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
+#, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr ""
+
+#: lib/command.php:180
+msgid "Sorry, this command is not yet implemented."
+msgstr ""
+
+#: lib/command.php:225
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "Puŝeto sendiĝis"
+
+#: lib/command.php:260
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:302
+#, fuzzy
+msgid "Notice marked as fave."
+msgstr "Ĉi tiu avizo jam estas ŝatata."
+
+#: lib/command.php:323
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "Vi estas jam grupano."
+
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "La uzanto %1$*s ne povas aliĝi al la grupo %2$*s."
+
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %1$s from group %2$s"
+msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
+
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
+#, fuzzy, php-format
+msgid "Fullname: %s"
+msgstr "Plena nomo"
+
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:422 lib/mail.php:268
+#, fuzzy, php-format
+msgid "Location: %s"
+msgstr "Loko"
+
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:426 lib/mail.php:271
+#, fuzzy, php-format
+msgid "Homepage: %s"
+msgstr "Hejmpaĝo"
+
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
+#, fuzzy, php-format
+msgid "About: %s"
+msgstr "Enkonduko"
+
+#: lib/command.php:457
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
+#, fuzzy, php-format
+msgid "Direct message to %s sent"
+msgstr "Rekta mesaĝo al %s sendiĝis."
+
+#: lib/command.php:494
+msgid "Error sending direct message."
+msgstr ""
+
+#: lib/command.php:514
+#, fuzzy
+msgid "Cannot repeat your own notice"
+msgstr "Vi ne povas ripeti vian propran avizon."
+
+#: lib/command.php:519
+#, fuzzy
+msgid "Already repeated that notice"
+msgstr "La avizo jam ripetiĝis."
+
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
+#, fuzzy, php-format
+msgid "Notice from %s repeated"
+msgstr "Avizo afiŝiĝas"
+
+#: lib/command.php:531
+#, fuzzy
+msgid "Error repeating notice."
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: lib/command.php:562
+#, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr ""
+
+#: lib/command.php:571
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "Ripetita al %s"
+
+#: lib/command.php:573
+#, fuzzy
+msgid "Error saving notice."
+msgstr "Eraris konservi uzanton: nevalida."
+
+#: lib/command.php:620
+msgid "Specify the name of the user to subscribe to"
+msgstr ""
+
+#: lib/command.php:628
+msgid "Can't subscribe to OMB profiles by command."
+msgstr ""
+
+#: lib/command.php:634
+#, fuzzy, php-format
+msgid "Subscribed to %s"
+msgstr "Abonita"
+
+#: lib/command.php:655 lib/command.php:754
+msgid "Specify the name of the user to unsubscribe from"
+msgstr ""
+
+#: lib/command.php:664
+#, fuzzy, php-format
+msgid "Unsubscribed from %s"
+msgstr "Malaboni"
+
+#: lib/command.php:682 lib/command.php:705
+msgid "Command not yet implemented."
+msgstr ""
+
+#: lib/command.php:685
+#, fuzzy
+msgid "Notification off."
+msgstr "Neniu konfirma kodo."
+
+#: lib/command.php:687
+msgid "Can't turn off notification."
+msgstr ""
+
+#: lib/command.php:708
+#, fuzzy
+msgid "Notification on."
+msgstr "Neniu konfirma kodo."
+
+#: lib/command.php:710
+#, fuzzy
+msgid "Can't turn on notification."
+msgstr "Vi ne povas ripeti vian propran avizon."
+
+#: lib/command.php:723
+msgid "Login command is disabled"
+msgstr ""
+
+#: lib/command.php:734
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:761
+#, fuzzy, php-format
+msgid "Unsubscribed  %s"
+msgstr "Malaboni"
+
+#: lib/command.php:778
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "Vi ne estas rajtigita."
+
+#: lib/command.php:780
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "Vi jam abonas jenajn uzantojn:"
+msgstr[1] "Vi jam abonas jenajn uzantojn:"
+
+#: lib/command.php:800
+msgid "No one is subscribed to you."
+msgstr ""
+
+#: lib/command.php:802
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/command.php:822
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "Vi ne estas grupano."
+
+#: lib/command.php:824
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "Vi ne estas grupano."
+msgstr[1] "Vi ne estas grupano."
+
+#: lib/command.php:838
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"lose <nickname> - force user to stop following you\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"repeat #<notice_id> - repeat a notice with a given id\n"
+"repeat <nickname> - repeat the last notice from user\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"login - Get a link to login to the web interface\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:135
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "Neniu konfirma kodo."
+
+#: lib/common.php:136
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:138
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:139
+msgid "Go to the installer."
+msgstr ""
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr ""
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr ""
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr ""
+
+#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgid "Connections"
+msgstr "Konekti"
+
+#: lib/connectsettingsaction.php:121
+#, fuzzy
+msgid "Authorized connected applications"
+msgstr "Konektita aplikaĵo"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "Malsukcesis alŝuti"
+
+#: lib/designsettings.php:109
+#, fuzzy
+msgid ""
+"You can upload your personal background image. The maximum file size is 2MB."
+msgstr "Vi povas alŝuti vian personan vizaĝbildon. Dosiero-grandlimo estas %s."
+
+#: lib/designsettings.php:418
+#, fuzzy
+msgid "Design defaults restored."
+msgstr "Desegna agordo konservita."
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "Forigi la avizon"
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "Forigi la avizon"
+
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr ""
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+msgid "Filter tags"
+msgstr ""
+
+#: lib/galleryaction.php:131
+#, fuzzy
+msgid "All"
+msgstr "Permesi"
+
+#: lib/galleryaction.php:139
+msgid "Select tag to filter"
+msgstr ""
+
+#: lib/galleryaction.php:140
+#, fuzzy
+msgid "Tag"
+msgstr "Markiloj"
+
+#: lib/galleryaction.php:141
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:143
+msgid "Go"
+msgstr "Iri"
+
+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
+#: lib/groupeditform.php:163
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "URL de via hejmpaĝo, blogo aŭ profilo ĉe alia retejo"
+
+#: lib/groupeditform.php:168
+msgid "Describe the group or topic"
+msgstr ""
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "Priskribu vin mem kaj viajn ŝatokupojn per ne pli ol %d signoj"
+
+#: lib/groupeditform.php:179
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "Kie vi estas, ekzemple \"Urbo, Ŝtato (aŭ Regiono), Lando\""
+
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85
+#, fuzzy
+msgid "Group"
+msgstr "Grupoj"
+
+#: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "Bloki"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "%s profiloj blokitaj"
+
+#: lib/groupnav.php:108
+#, fuzzy, php-format
+msgid "Edit %s group properties"
+msgstr "Redakti %s grupon"
+
+#: lib/groupnav.php:113
+#, fuzzy
+msgid "Logo"
+msgstr " Elsaluti"
+
+#: lib/groupnav.php:114
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupnav.php:120
+#, php-format
+msgid "Add or edit %s design"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+#, fuzzy
+msgid "Groups with most members"
+msgstr "%s grupanoj"
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104
+msgid "This page is not available in a media type you accept"
+msgstr ""
+
+#: lib/imagefile.php:72
+#, fuzzy
+msgid "Unsupported image file format."
+msgstr "Formato ne subtenata."
+
+#: lib/imagefile.php:88
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr ""
+"Vi povas alŝuti emblemo-bildon por via grupo. Dosiero-grandlimo estas $s."
+
+#: lib/imagefile.php:93
+#, fuzzy
+msgid "Partial upload."
+msgstr "Neniu dosiero alŝutiĝas."
+
+#: lib/imagefile.php:101 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr ""
+
+#: lib/imagefile.php:109
+msgid "Not an image or corrupt file."
+msgstr ""
+
+#: lib/imagefile.php:122
+#, fuzzy
+msgid "Lost our file."
+msgstr "Perdiĝis nia dosiera datumo."
+
+#: lib/imagefile.php:163 lib/imagefile.php:224
+msgid "Unknown file type"
+msgstr ""
+
+#: lib/imagefile.php:244
+msgid "MB"
+msgstr ""
+
+#: lib/imagefile.php:246
+msgid "kB"
+msgstr ""
+
+#: lib/jabber.php:387
+#, php-format
+msgid "[%s]"
+msgstr ""
+
+#: lib/jabber.php:567
+#, php-format
+msgid "Unknown inbox source %d."
+msgstr ""
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "Ensaluti"
+
+#: lib/leaveform.php:114
+msgid "Leave"
+msgstr "Forlasi"
+
+#: lib/logingroupnav.php:80
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "Ensaluti per via uzantnomo kaj pasvorto."
+
+#: lib/logingroupnav.php:86
+msgid "Sign up for a new account"
+msgstr ""
+
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
+#, fuzzy
+msgid "Email address confirmation"
+msgstr "Retpoŝtadreso"
+
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
+
+#. TRANS: Subject of new-subscriber notification e-mail
+#: lib/mail.php:243
+#, fuzzy, php-format
+msgid "%1$s is now listening to your notices on %2$s."
+msgstr "%1$s invitis vin kunaliĝi ĉe %2$s"
+
+#: lib/mail.php:248
+#, php-format
+msgid ""
+"If you believe this account is being used abusively, you can block them from "
+"your subscribers list and report as spam to site administrators at %s"
+msgstr ""
+
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:254
+#, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:274
+#, fuzzy, php-format
+msgid "Bio: %s"
+msgstr "Biografio"
+
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:304
+#, fuzzy, php-format
+msgid "New email address for posting to %s"
+msgstr "Krei novan retpoŝtadreson por afiŝado kaj nuligi la antaŭan."
+
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:308
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:433
+#, fuzzy, php-format
+msgid "%s status"
+msgstr "Stato de %1$s ĉe %2$s"
+
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:460
+#, fuzzy
+msgid "SMS confirmation"
+msgstr "Neniu konfirma kodo."
+
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:463
+#, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr ""
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:484
+#, php-format
+msgid "You've been nudged by %s"
+msgstr ""
+
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:489
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:536
+#, fuzzy, php-format
+msgid "New private message from %s"
+msgstr "Rektaj mesaĝoj de %s"
+
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:541
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:589
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "Sendu al mi mesaĝon tiam, kiam iu ŝatas mian avizon ."
+
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:592
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:651
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:657
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:660
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
+msgstr ""
+
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/mailbox.php:228 lib/noticelist.php:506
+msgid "from"
+msgstr ""
+
+#: lib/mailhandler.php:37
+#, fuzzy
+msgid "Could not parse message."
+msgstr "Malsukcesis ĝisdatigi uzanton"
+
+#: lib/mailhandler.php:42
+msgid "Not a registered user."
+msgstr ""
+
+#: lib/mailhandler.php:46
+#, fuzzy
+msgid "Sorry, that is not your incoming email address."
+msgstr "Tiu ne estas via retpoŝtadreso."
+
+#: lib/mailhandler.php:50
+#, fuzzy
+msgid "Sorry, no incoming email allowed."
+msgstr "Ne estas alvena retpoŝtadreso"
+
+#: lib/mailhandler.php:228
+#, fuzzy, php-format
+msgid "Unsupported message type: %s"
+msgstr "Formato ne subtenata."
+
+#: lib/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:217
+msgid "File exceeds user's quota."
+msgstr ""
+
+#: lib/mediafile.php:197 lib/mediafile.php:234
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:202 lib/mediafile.php:238
+#, fuzzy
+msgid "Could not determine file's MIME type."
+msgstr " Malsukcesis certigi fontan uzanton."
+
+#: lib/mediafile.php:318
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:323
+#, php-format
+msgid "%s is not a supported file type on this server."
+msgstr ""
+
+#: lib/messageform.php:120
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "Forigi avizon"
+
+#: lib/messageform.php:146
+msgid "To"
+msgstr "Al"
+
+#: lib/messageform.php:159 lib/noticeform.php:185
+msgid "Available characters"
+msgstr "Haveblaj karakteroj"
+
+#: lib/messageform.php:178 lib/noticeform.php:236
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "Sendi"
+
+#: lib/noticeform.php:160
+#, fuzzy
+msgid "Send a notice"
+msgstr "Nova avizo"
+
+#: lib/noticeform.php:173
+#, php-format
+msgid "What's up, %s?"
+msgstr ""
+
+#: lib/noticeform.php:192
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:196
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticeform.php:212
+msgid "Share my location"
+msgstr ""
+
+#: lib/noticeform.php:215
+#, fuzzy
+msgid "Do not share my location"
+msgstr "Ne forigu ĉi tiun aplikaĵon."
+
+#: lib/noticeform.php:216
+msgid ""
+"Sorry, retrieving your geo location is taking longer than expected, please "
+"try again later"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of north
+#: lib/noticelist.php:436
+#, fuzzy
+msgid "N"
+msgstr "Ne"
+
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:438
+msgid "S"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:440
+msgid "E"
+msgstr ""
+
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:442
+msgid "W"
+msgstr ""
+
+#: lib/noticelist.php:444
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:453
+msgid "at"
+msgstr "al"
+
+#: lib/noticelist.php:568
+#, fuzzy
+msgid "in context"
+msgstr "Neniu enhavo!"
+
+#: lib/noticelist.php:603
+#, fuzzy
+msgid "Repeated by"
+msgstr "Ripetita"
+
+#: lib/noticelist.php:630
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "Forigi la avizon"
+
+#: lib/noticelist.php:631
+msgid "Reply"
+msgstr ""
+
+#: lib/noticelist.php:675
+#, fuzzy
+msgid "Notice repeated"
+msgstr "Avizo viŝiĝas"
+
+#: lib/nudgeform.php:116
+#, fuzzy
+msgid "Nudge this user"
+msgstr "Forigi la uzanton"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Nudge"
+msgstr "Puŝeto sendiĝis"
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "Vi ne povas sendi mesaĝon al la uzanto."
+
+#: lib/oauthstore.php:283
+#, fuzzy
+msgid "Error inserting new profile"
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: lib/oauthstore.php:291
+#, fuzzy
+msgid "Error inserting avatar"
+msgstr "Eraris konservi uzanton: nevalida."
+
+#: lib/oauthstore.php:306
+#, fuzzy
+msgid "Error updating remote profile"
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: lib/oauthstore.php:311
+#, fuzzy
+msgid "Error inserting remote profile"
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "Forigi avizon"
+
+#: lib/oauthstore.php:490
+#, fuzzy
+msgid "Couldn't insert new subscription."
+msgstr "Malsukcesis enmeti konfirmkodon."
+
+#: lib/personalgroupnav.php:99
+#, fuzzy
+msgid "Personal"
+msgstr "Persona"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr ""
+
+#: lib/personalgroupnav.php:114
+#, fuzzy
+msgid "Favorites"
+msgstr "Aldoni al ŝatolisto"
+
+#: lib/personalgroupnav.php:125
+msgid "Inbox"
+msgstr ""
+
+#: lib/personalgroupnav.php:126
+#, fuzzy
+msgid "Your incoming messages"
+msgstr "Ne estas alvena retpoŝtadreso"
+
+#: lib/personalgroupnav.php:130
+#, fuzzy
+msgid "Outbox"
+msgstr "Elirkesto de %s"
+
+#: lib/personalgroupnav.php:131
+#, fuzzy
+msgid "Your sent messages"
+msgstr "Persona mesaĝo"
+
+#: lib/personaltagcloudsection.php:56
+#, php-format
+msgid "Tags in %s's notices"
+msgstr ""
+
+#: lib/plugin.php:115
+msgid "Unknown"
+msgstr ""
+
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#, fuzzy
+msgid "Subscriptions"
+msgstr "Priskribo"
+
+#: lib/profileaction.php:126
+#, fuzzy
+msgid "All subscriptions"
+msgstr "Priskribo"
+
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#, fuzzy
+msgid "Subscribers"
+msgstr "Aboni"
+
+#: lib/profileaction.php:161
+#, fuzzy
+msgid "All subscribers"
+msgstr "Malaboni"
+
+#: lib/profileaction.php:191
+#, fuzzy
+msgid "User ID"
+msgstr "Uzanto"
+
+#: lib/profileaction.php:196
+#, fuzzy
+msgid "Member since"
+msgstr "Grupanoj"
+
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264
+#, fuzzy
+msgid "All groups"
+msgstr "Grupoj de %s"
+
+#: lib/profileformaction.php:123
+msgid "Unimplemented method."
+msgstr ""
+
+#: lib/publicgroupnav.php:78
+msgid "Public"
+msgstr "Publika"
+
+#: lib/publicgroupnav.php:82
+msgid "User groups"
+msgstr "Uzantaj grupoj"
+
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
+msgid "Recent tags"
+msgstr "Freŝaj etikedoj"
+
+#: lib/publicgroupnav.php:88
+#, fuzzy
+msgid "Featured"
+msgstr "Elstaraj uzantoj"
+
+#: lib/publicgroupnav.php:92
+#, fuzzy
+msgid "Popular"
+msgstr "Populara avizo"
+
+#: lib/redirectingaction.php:95
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "Ne estas aldonaĵo."
+
+#: lib/repeatform.php:107
+#, fuzzy
+msgid "Repeat this notice?"
+msgstr "Forigi la avizon"
+
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Jes"
+
+#: lib/repeatform.php:132
+#, fuzzy
+msgid "Repeat this notice"
+msgstr "Forigi la avizon"
+
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "Bloki la uzanton de la grupo"
+
+#: lib/router.php:709
+msgid "No single user defined for single-user mode."
+msgstr ""
+
+#: lib/sandboxform.php:67
+msgid "Sandbox"
+msgstr ""
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#: lib/searchaction.php:120
+msgid "Search site"
+msgstr ""
+
+#: lib/searchaction.php:126
+msgid "Keyword(s)"
+msgstr ""
+
+#: lib/searchaction.php:127
+#, fuzzy
+msgid "Search"
+msgstr "Homserĉo"
+
+#: lib/searchaction.php:162
+msgid "Search help"
+msgstr ""
+
+#: lib/searchgroupnav.php:80
+#, fuzzy
+msgid "People"
+msgstr "Homserĉo"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr ""
+
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr ""
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "grupoj ĉe %s"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/section.php:106
+msgid "More..."
+msgstr "Pli..."
+
+#: lib/silenceform.php:67
+msgid "Silence"
+msgstr "Silento"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "Forigi la uzanton"
+
+#: lib/subgroupnav.php:83
+#, php-format
+msgid "People %s subscribes to"
+msgstr ""
+
+#: lib/subgroupnav.php:91
+#, php-format
+msgid "People subscribed to %s"
+msgstr ""
+
+#: lib/subgroupnav.php:99
+#, fuzzy, php-format
+msgid "Groups %s is a member of"
+msgstr "Grupoj de %2$s ĉe %1$s."
+
+#: lib/subgroupnav.php:105
+#, fuzzy
+msgid "Invite"
+msgstr "Inviti"
+
+#: lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "Inviti amikojn kaj kolegojn aliĝi vin sur %s"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "Noto"
+
+#: lib/themeuploader.php:50
+msgid "This server cannot handle theme uploads without ZIP support."
+msgstr ""
+
+#: lib/themeuploader.php:58 lib/themeuploader.php:61
+msgid "The theme file is missing or the upload failed."
+msgstr ""
+
+#: lib/themeuploader.php:91 lib/themeuploader.php:102
+#: lib/themeuploader.php:253 lib/themeuploader.php:257
+#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#, fuzzy
+msgid "Failed saving theme."
+msgstr "Eraris ĝisdatigi vizaĝbildon."
+
+#: lib/themeuploader.php:139
+msgid "Invalid theme: bad directory structure."
+msgstr ""
+
+#: lib/themeuploader.php:166
+#, php-format
+msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
+msgstr ""
+
+#: lib/themeuploader.php:178
+msgid "Invalid theme archive: missing file css/display.css"
+msgstr ""
+
+#: lib/themeuploader.php:205
+msgid ""
+"Theme contains invalid file or folder name. Stick with ASCII letters, "
+"digits, underscore, and minus sign."
+msgstr ""
+
+#: lib/themeuploader.php:216
+#, php-format
+msgid "Theme contains file of type '.%s', which is not allowed."
+msgstr ""
+
+#: lib/themeuploader.php:234
+#, fuzzy
+msgid "Error opening theme archive."
+msgstr "Eraro je ĝisdatigo de fora profilo."
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
+#, fuzzy
+msgid "Unsandbox this user"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#: lib/unsilenceform.php:67
+#, fuzzy
+msgid "Unsilence"
+msgstr "Silento"
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "Malbloki ĉi tiun uzanton"
+
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "Malaboni"
+
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "La uzanto ne havas profilon."
+
+#: lib/userprofile.php:117
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "Vizaĝbildo"
+
+#: lib/userprofile.php:234 lib/userprofile.php:248
+#, fuzzy
+msgid "User actions"
+msgstr "Uzantaj grupoj"
+
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "Profila agordo"
+
+#: lib/userprofile.php:264
+msgid "Edit"
+msgstr "Redakti"
+
+#: lib/userprofile.php:287
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "Vi ne povas sendi mesaĝon al la uzanto."
+
+#: lib/userprofile.php:288
+msgid "Message"
+msgstr "Mesaĝo"
+
+#: lib/userprofile.php:326
+msgid "Moderate"
+msgstr "Moderigi"
+
+#: lib/userprofile.php:364
+#, fuzzy
+msgid "User role"
+msgstr "Uzantaj grupoj"
+
+#: lib/userprofile.php:366
+msgctxt "role"
+msgid "Administrator"
+msgstr "Administranto"
+
+#: lib/userprofile.php:367
+msgctxt "role"
+msgid "Moderator"
+msgstr "Moderanto"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1100
+msgid "a few seconds ago"
+msgstr "antaŭ kelkaj sekundoj"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1103
+msgid "about a minute ago"
+msgstr "antaŭ ĉirkaŭ unu minuto"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1107
+#, php-format
+msgid "about %d minutes ago"
+msgstr "antaŭ ĉirkaŭ %d minutoj"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1110
+msgid "about an hour ago"
+msgstr "antaŭ ĉirkaŭ unu horo"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1114
+#, php-format
+msgid "about %d hours ago"
+msgstr "antaŭ ĉirkaŭ %d horoj"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1117
+msgid "about a day ago"
+msgstr "antaŭ ĉirkaŭ unu tago"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1121
+#, fuzzy, php-format
+msgid "about %d days ago"
+msgstr "antaŭ ĉirkaŭ unu tago"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1124
+#, fuzzy
+msgid "about a month ago"
+msgstr "antaŭ ĉirkaŭ unu minuto"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1128
+#, fuzzy, php-format
+msgid "about %d months ago"
+msgstr "antaŭ ĉirkaŭ %d minutoj"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1131
+#, fuzzy
+msgid "about a year ago"
+msgstr "antaŭ ĉirkaŭ unu tago"
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "Ĉefpaĝo ne estas valida URL."
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: lib/xmppmanager.php:403
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 9fb531ff3..822d4fcf8 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: 2010-08-11 10:11+0000\n"
+"POT-Creation-Date: 2010-08-11 10:48+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"
-- 
cgit v1.2.3


From d15a41c96e97428843cc731cc88b63be9f57c489 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Wed, 11 Aug 2010 10:32:52 -0700
Subject: 0.9.4beta2 update some notes in README, note the fix from beta1

---
 README         | 37 +++++++++++++++++++++----------------
 lib/common.php |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/README b/README
index 9e59ccb44..c20244354 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 0.9.3 ("Half a World Away")
-29 June 2010
+StatusNet 0.9.4beta2
+11 August 2010
 
 This is the README file for StatusNet, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -77,27 +77,31 @@ for additional terms.
 New this version
 ================
 
-This is a minor bug and feature release since version 0.9.2 released on
-4 May 2010.
+This is a security, bug and feature release since version 0.9.3 released on
+29 June 2010.
 
 For best compatibility with client software and site federation, and a lot of
 bug fixes, it is highly recommended that all public sites upgrade to the new
 version.
 
+Changes from 0.9.4beta1:
+- fix for daemon config switching on multi-site setup
+
 Notable changes this version:
 
-- Enhanced API output to aid StatusNet-specific clients
+- OpenID and OAuth libraries patched for potential timing attack
+- OStatus feed i/o updated for Activity Streams
+- Correctness fixes on XRD, other discovery bits
+- Support for contacting SNI-based SSL virtual hosts when SSL
+  certificate verification is enabled (requires PHP 5.3.2+ or
+  enabling CURL backend with $config['http']['curl'] = true)
+- Experimental SubMirror plugin
+- Multi-site status_network table mode has been tweaked to support
+  multiple tags better
 - Many updates to user interface translation from TranslateWiki
-- OStatus now works subscribing to SSL-protected sites by default
-- OpenID now works on PHP 5.3, supports closer site integration.
-- Numerous API and FOAF output fixes.
-- Fixes to Facebook integration for FB API behavior changes
-- PostgreSQL support updates
-- Initial version of a custom theme uploader (disabled by default)
-- LDAP auth plugins cleanup
 - Many other bugfixes
 
-A full changelog is available at http://status.net/wiki/StatusNet_0.9.3.
+A full changelog is available at http://status.net/wiki/StatusNet_0.9.4.
 
 Prerequisites
 =============
@@ -125,7 +129,6 @@ Your PHP installation must include the following PHP extensions:
 - MySQL. For accessing the database.
 - GD. For scaling down avatar images.
 - mbstring. For handling Unicode (UTF-8) encoded strings.
-- gettext. For multiple languages. Default on many PHP installs.
 
 For some functionality, you will also need the following extensions:
 
@@ -140,6 +143,8 @@ For some functionality, you will also need the following extensions:
   Sphinx server to serve the search queries.
 - bcmath or gmp. For Salmon signatures (part of OStatus). Needed
   if you have OStatus configured.
+- gettext. For multiple languages. Default on many PHP installs;
+  will be emulated if not present.
 
 You will almost definitely get 2-3 times better performance from your
 site if you install a PHP bytecode cache/accelerator. Some well-known
@@ -209,7 +214,7 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-       tar zxf statusnet-0.9.2.tar.gz
+       tar zxf statusnet-0.9.4.tar.gz
 
    ...which will make a statusnet-0.9.2 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
@@ -219,7 +224,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-       mv statusnet-0.9.2 /var/www/statusnet
+       mv statusnet-0.9.4 /var/www/statusnet
 
    This will make your StatusNet instance available in the statusnet path of
    your server, like "http://example.net/statusnet". "microblog" or
diff --git a/lib/common.php b/lib/common.php
index ddd06bf92..897d08b77 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.4beta1');
+define('STATUSNET_VERSION', '0.9.4beta2');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Orange Crush');
-- 
cgit v1.2.3


From 111fc33e1aa521e8ad33fa333654d09f45a1a24e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 11 Aug 2010 18:53:34 -0700
Subject: Output "web" instead of gettext translation file metadata when
 notice.source is empty

---
 lib/noticelist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index dbc5bfb51..529d6a3f9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -499,7 +499,7 @@ class NoticeListItem extends Widget
         $ns = $this->notice->getSource();
 
         if ($ns) {
-            $source_name = (empty($ns->name)) ? _($ns->code) : _($ns->name);
+            $source_name = (empty($ns->name)) ? ($ns->code ? _($ns->code) : _('web')) : _($ns->name);
             $this->out->text(' ');
             $this->out->elementStart('span', 'source');
             // FIXME: probably i18n issue. If "from" is followed by text, that should be a parameter to "from" (from %s).
-- 
cgit v1.2.3


From f7d599f8eac0a9e3d47c3ff2f074bed0b6e9c124 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@status.net>
Date: Thu, 12 Aug 2010 15:19:47 -0700
Subject: Fix for ticket 2513: "Can't linkify" error when some links are
 shortened

When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)

http://status.net/open-source/issues/2513
---
 classes/File_redirection.php | 8 ++++++++
 lib/util.php                 | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/classes/File_redirection.php b/classes/File_redirection.php
index f128b3e07..51b8be3b0 100644
--- a/classes/File_redirection.php
+++ b/classes/File_redirection.php
@@ -210,6 +210,14 @@ class File_redirection extends Memcached_DataObject
                 } else if (is_string($redir_data)) {
                     // The file is a known redirect target.
                     $file = File::staticGet('url', $redir_data);
+                    if (empty($file)) {
+                        // @fixme should we save a new one?
+                        // this case was triggering sometimes for redirects
+                        // with unresolvable targets; found while fixing
+                        // "can't linkify" bugs with shortened links to
+                        // SSL sites with cert issues.
+                        return null;
+                    }
                     $file_id = $file->id;
                 }
             } else {
diff --git a/lib/util.php b/lib/util.php
index 9f62097d5..66600c766 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -830,7 +830,10 @@ function common_linkify($url) {
         } elseif (is_string($longurl_data)) {
             $longurl = $longurl_data;
         } else {
-            throw new ServerException("Can't linkify url '$url'");
+            // Unable to reach the server to verify contents, etc
+            // Just pass the link on through for now.
+            common_log(LOG_ERR, "Can't linkify url '$url'");
+            $longurl = $url;
         }
     }
     $attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
-- 
cgit v1.2.3


From d06bdfa54bab19c04d4e4dd74801df57bcd5a19c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 12 Aug 2010 18:42:09 -0700
Subject: add note about software subscription

---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index c20244354..93b63c2ac 100644
--- a/README
+++ b/README
@@ -43,6 +43,10 @@ on status.net is identical to the software available for download, so
 you can move back and forth between a hosted version or a version
 installed on your own servers.
 
+A commercial software subscription is available from StatusNet Inc. It
+includes 24-hour technical support and developer support. More
+information at http://status.net/contact or email sales@status.net.
+
 License
 =======
 
-- 
cgit v1.2.3


From 4217277d14ef1b244a15a8c2fe5dd41e7be6ed1e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 13:07:25 -0700
Subject: typo mixing up  and  in salmonaction

---
 plugins/OStatus/lib/salmonaction.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index fa9dc3b1d..9d6c6b269 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -47,7 +47,6 @@ class SalmonAction extends Action
 
         $xml = file_get_contents('php://input');
 
-
         // Check the signature
         $salmon = new Salmon;
         if (!$salmon->verifyMagicEnv($xml)) {
@@ -58,7 +57,6 @@ class SalmonAction extends Action
             $env = $magic_env->parse($xml);
             $xml = $magic_env->unfold($env);
         }
-        
 
         $dom = DOMDocument::loadXML($xml);
         if ($dom->documentElement->namespaceURI != Activity::ATOM ||
@@ -67,7 +65,7 @@ class SalmonAction extends Action
             $this->clientError(_m('Salmon post must be an Atom entry.'));
         }
 
-        $this->act = new Activity($dom->documentElement);
+        $this->activity = new Activity($dom->documentElement);
         return true;
     }
 
@@ -79,9 +77,9 @@ class SalmonAction extends Action
     {
         StatusNet::setApi(true); // Send smaller error pages
 
-        common_log(LOG_DEBUG, "Got a " . $this->act->verb);
+        common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
         if (Event::handle('StartHandleSalmon', array($this->activity))) {
-            switch ($this->act->verb)
+            switch ($this->activity->verb)
             {
             case ActivityVerb::POST:
                 $this->handlePost();
@@ -164,12 +162,12 @@ class SalmonAction extends Action
      */
     function handleUpdateProfile()
     {
-        $oprofile = Ostatus_profile::getActorProfile($this->act);
+        $oprofile = Ostatus_profile::getActorProfile($this->activity);
         if ($oprofile) {
             common_log(LOG_INFO, "Got a profile-update ping from $oprofile->uri");
-            $oprofile->updateFromActivityObject($this->act->actor);
+            $oprofile->updateFromActivityObject($this->activity->actor);
         } else {
-            common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->act->actor->id);
+            common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->activity->actor->id);
         }
     }
 
@@ -178,10 +176,10 @@ class SalmonAction extends Action
      */
     function ensureProfile()
     {
-        $actor = $this->act->actor;
+        $actor = $this->activity->actor;
         if (empty($actor->id)) {
             common_log(LOG_ERR, "broken actor: " . var_export($actor, true));
-            common_log(LOG_ERR, "activity with no actor: " . var_export($this->act, true));
+            common_log(LOG_ERR, "activity with no actor: " . var_export($this->activity, true));
             throw new Exception("Received a salmon slap from unidentified actor.");
         }
 
@@ -191,6 +189,6 @@ class SalmonAction extends Action
     function saveNotice()
     {
         $oprofile = $this->ensureProfile();
-        return $oprofile->processPost($this->act, 'salmon');
+        return $oprofile->processPost($this->activity, 'salmon');
     }
 }
-- 
cgit v1.2.3


From 8dec16aeebc723d36e31f4a3fa5e695bdf92647b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 13:14:47 -0700
Subject: add hooks to allow plugins to handle different kinds of activities

---
 plugins/OStatus/classes/Ostatus_profile.php | 35 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 8f8eb773f..1fae468f6 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -445,26 +445,31 @@ class Ostatus_profile extends Memcached_DataObject
      * @param DOMElement $feed for context
      * @param string $source identifier ("push" or "salmon")
      */
+
     public function processEntry($entry, $feed, $source)
     {
         $activity = new Activity($entry, $feed);
 
-        // @todo process all activity objects
-        switch ($activity->objects[0]->type) {
-        case ActivityObject::ARTICLE:
-        case ActivityObject::BLOGENTRY:
-        case ActivityObject::NOTE:
-        case ActivityObject::STATUS:
-        case ActivityObject::COMMENT:
-            break;
-        default:
-            throw new ClientException("Can't handle that kind of post.");
-        }
+        if (Event::handle('StartHandleFeedEntry', array($activity))) {
+
+            // @todo process all activity objects
+            switch ($activity->objects[0]->type) {
+            case ActivityObject::ARTICLE:
+            case ActivityObject::BLOGENTRY:
+            case ActivityObject::NOTE:
+            case ActivityObject::STATUS:
+            case ActivityObject::COMMENT:
+                if ($activity->verb == ActivityVerb::POST) {
+                    $this->processPost($activity, $source);
+                } else {
+                    common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
+                }
+                break;
+            default:
+                throw new ClientException("Can't handle that kind of post.");
+            }
 
-        if ($activity->verb == ActivityVerb::POST) {
-            $this->processPost($activity, $source);
-        } else {
-            common_log(LOG_INFO, "Ignoring activity with unrecognized verb $activity->verb");
+            Event::handle('EndHandleFeedEntry', array($activity));
         }
     }
 
-- 
cgit v1.2.3


From 029aa0c61c9942c0688fd3dc9aa2893311543db1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 14:18:54 -0700
Subject: fix use of activity rather than act in salmonaction subclasses, too

---
 plugins/OStatus/actions/groupsalmon.php |  4 ++--
 plugins/OStatus/actions/usersalmon.php  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php
index d60725a71..5094dccf0 100644
--- a/plugins/OStatus/actions/groupsalmon.php
+++ b/plugins/OStatus/actions/groupsalmon.php
@@ -61,7 +61,7 @@ class GroupsalmonAction extends SalmonAction
     function handlePost()
     {
         // @fixme process all objects?
-        switch ($this->act->objects[0]->type) {
+        switch ($this->activity->objects[0]->type) {
         case ActivityObject::ARTICLE:
         case ActivityObject::BLOGENTRY:
         case ActivityObject::NOTE:
@@ -74,7 +74,7 @@ class GroupsalmonAction extends SalmonAction
 
         // Notice must be to the attention of this group
 
-        $context = $this->act->context;
+        $context = $this->activity->context;
 
         if (empty($context->attention)) {
             throw new ClientException("Not to the attention of anyone.");
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 6c360c49f..641e131ab 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -55,10 +55,10 @@ class UsersalmonAction extends SalmonAction
      */
     function handlePost()
     {
-        common_log(LOG_INFO, "Received post of '{$this->act->objects[0]->id}' from '{$this->act->actor->id}'");
+        common_log(LOG_INFO, "Received post of '{$this->activity->objects[0]->id}' from '{$this->activity->actor->id}'");
 
         // @fixme: process all activity objects?
-        switch ($this->act->objects[0]->type) {
+        switch ($this->activity->objects[0]->type) {
         case ActivityObject::ARTICLE:
         case ActivityObject::BLOGENTRY:
         case ActivityObject::NOTE:
@@ -72,7 +72,7 @@ class UsersalmonAction extends SalmonAction
         // Notice must either be a) in reply to a notice by this user
         // or b) to the attention of this user
 
-        $context = $this->act->context;
+        $context = $this->activity->context;
 
         if (!empty($context->replyToID)) {
             $notice = Notice::staticGet('uri', $context->replyToID);
@@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction
             throw new ClientException("Not to anyone in reply to anything!");
         }
 
-        $existing = Notice::staticGet('uri', $this->act->objects[0]->id);
+        $existing = Notice::staticGet('uri', $this->activity->objects[0]->id);
 
         if (!empty($existing)) {
             common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists.");
@@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction
 
     function handleFavorite()
     {
-        $notice = $this->getNotice($this->act->objects[0]);
+        $notice = $this->getNotice($this->activity->objects[0]);
         $profile = $this->ensureProfile()->localProfile();
 
         $old = Fave::pkeyGet(array('user_id' => $profile->id,
@@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction
      */
     function handleUnfavorite()
     {
-        $notice = $this->getNotice($this->act->objects[0]);
+        $notice = $this->getNotice($this->activity->objects[0]);
         $profile = $this->ensureProfile()->localProfile();
 
         $fave = Fave::pkeyGet(array('user_id' => $profile->id,
-- 
cgit v1.2.3